Permalink
Browse files

Merge pull request #7490 from zackhow/fix-crash

Android: fix crash on rotate
  • Loading branch information...
JosJuice committed Oct 13, 2018
2 parents 22c6343 + cd02a16 commit 1fe40c59fa7dbd5ecf2bedfdb941e72f0315a382
@@ -217,8 +217,6 @@ protected void onCreate(Bundle savedInstanceState)
mPlatform = gameToEmulate.getIntExtra(EXTRA_PLATFORM, 0);
mScreenPath = gameToEmulate.getStringExtra(EXTRA_SCREEN_PATH);
mPosition = gameToEmulate.getIntExtra(EXTRA_GRID_POSITION, -1);
mSettings = new Settings();
mSettings.loadSettings(null);
activityRecreated = false;
}
else
@@ -227,6 +225,9 @@ protected void onCreate(Bundle savedInstanceState)
restoreState(savedInstanceState);
}
mSettings = new Settings();
mSettings.loadSettings(null);
// TODO: The accurate way to find out which console we're emulating is to
// first launch emulation and then ask the core which console we're emulating
sIsGameCubeGame = Platform.fromNativeInt(mPlatform) == Platform.GAMECUBE;

0 comments on commit 1fe40c5

Please sign in to comment.