Commit 58cf5860 authored by TwistedUmbrella's avatar TwistedUmbrella
Browse files

Merge pull request #777 from reicast/nativeact

Add a missing check for native activity context
parents 955c9b99 537e1172
...@@ -37,7 +37,6 @@ import com.android.util.FileUtils; ...@@ -37,7 +37,6 @@ import com.android.util.FileUtils;
import com.reicast.emulator.GL2JNIActivity; import com.reicast.emulator.GL2JNIActivity;
import com.reicast.emulator.GL2JNINative; import com.reicast.emulator.GL2JNINative;
import com.reicast.emulator.MainActivity; import com.reicast.emulator.MainActivity;
import com.reicast.emulator.R;
import com.reicast.emulator.config.Config; import com.reicast.emulator.config.Config;
import com.reicast.emulator.emu.OnScreenMenu.FpsPopup; import com.reicast.emulator.emu.OnScreenMenu.FpsPopup;
import com.reicast.emulator.periph.VJoy; import com.reicast.emulator.periph.VJoy;
...@@ -186,7 +185,7 @@ public class GL2JNIView extends GLSurfaceView ...@@ -186,7 +185,7 @@ public class GL2JNIView extends GLSurfaceView
// This is the game we are going to run // This is the game we are going to run
fileName = newFileName; 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) if (GL2JNINative.syms != null)
JNIdc.data(1, GL2JNINative.syms); JNIdc.data(1, GL2JNINative.syms);
} else { } else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment