ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

android: NPE in NativeGLView when Emulator.currentActivity is null

This commit is contained in:
Flyinghead 2024-08-15 11:58:45 +02:00
parent 09ab139407
commit dae3676979
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shell/android-studio/flycast/src/main/java/com/flycast/emulator/emu/NativeGLView.java
View File

@ -17,6 +17,7 @@ import android.view.View;
import android.view.WindowInsets; import android.view.WindowInsets;
import android.view.WindowManager; import android.view.WindowManager;
import com.flycast.emulator.BaseGLActivity;
import com.flycast.emulator.Emulator; import com.flycast.emulator.Emulator;
import com.flycast.emulator.periph.InputDeviceManager; import com.flycast.emulator.periph.InputDeviceManager;
@ -126,7 +127,9 @@ public class NativeGLView extends SurfaceView implements SurfaceHolder.Callback
Log.i("flycast", "NativeGLView.surfaceChanged: " + w + "x" + h); Log.i("flycast", "NativeGLView.surfaceChanged: " + w + "x" + h);
surfaceReady = true; surfaceReady = true;
JNIdc.rendinitNative(surfaceHolder.getSurface(), w, h); JNIdc.rendinitNative(surfaceHolder.getSurface(), w, h);
Emulator.getCurrentActivity().handleStateChange(false); BaseGLActivity activity = Emulator.getCurrentActivity();
if (activity != null)
activity.handleStateChange(false);
} }
@Override @Override
@ -134,7 +137,9 @@ public class NativeGLView extends SurfaceView implements SurfaceHolder.Callback
Log.i("flycast", "NativeGLView.surfaceDestroyed"); Log.i("flycast", "NativeGLView.surfaceDestroyed");
surfaceReady = false; surfaceReady = false;
JNIdc.rendinitNative(null, 0, 0); JNIdc.rendinitNative(null, 0, 0);
Emulator.getCurrentActivity().handleStateChange(true); BaseGLActivity activity = Emulator.getCurrentActivity();
if (activity != null)
activity.handleStateChange(true);
} }
public boolean isSurfaceReady() { public boolean isSurfaceReady() {