From 537e1172e054bc50abaca89e780d95487f6b8ec2 Mon Sep 17 00:00:00 2001 From: TwistedUmbrella Date: Wed, 19 Aug 2015 16:41:00 -0400 Subject: [PATCH] Add a missing check for native activity context --- shell/android/src/com/reicast/emulator/emu/GL2JNIView.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java b/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java index 848f942ba..10302a777 100644 --- a/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java +++ b/shell/android/src/com/reicast/emulator/emu/GL2JNIView.java @@ -37,7 +37,6 @@ import com.android.util.FileUtils; import com.reicast.emulator.GL2JNIActivity; import com.reicast.emulator.GL2JNINative; import com.reicast.emulator.MainActivity; -import com.reicast.emulator.R; import com.reicast.emulator.config.Config; import com.reicast.emulator.emu.OnScreenMenu.FpsPopup; import com.reicast.emulator.periph.VJoy; @@ -186,7 +185,7 @@ public class GL2JNIView extends GLSurfaceView // This is the game we are going to run fileName = newFileName; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD && Config.nativeact) { if (GL2JNINative.syms != null) JNIdc.data(1, GL2JNINative.syms); } else {