piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7490 from zackhow/fix-crash

Browse Source 
Android: fix crash on rotate
This commit is contained in:
JosJuice 2018-10-13 13:51:01 +02:00 committed by GitHub
commit 1fe40c59fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
View File

@ -217,8 +217,6 @@ public final class EmulationActivity extends AppCompatActivity
mPlatform = gameToEmulate.getIntExtra(EXTRA_PLATFORM, 0); mPlatform = gameToEmulate.getIntExtra(EXTRA_PLATFORM, 0);
mScreenPath = gameToEmulate.getStringExtra(EXTRA_SCREEN_PATH); mScreenPath = gameToEmulate.getStringExtra(EXTRA_SCREEN_PATH);
mPosition = gameToEmulate.getIntExtra(EXTRA_GRID_POSITION, -1); mPosition = gameToEmulate.getIntExtra(EXTRA_GRID_POSITION, -1);
mSettings = new Settings();
mSettings.loadSettings(null);
activityRecreated = false; activityRecreated = false;
} }
else else
@ -227,6 +225,9 @@ public final class EmulationActivity extends AppCompatActivity
restoreState(savedInstanceState); restoreState(savedInstanceState);
} }
mSettings = new Settings();
mSettings.loadSettings(null);
// TODO: The accurate way to find out which console we're emulating is to // 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 // first launch emulation and then ask the core which console we're emulating
sIsGameCubeGame = Platform.fromNativeInt(mPlatform) == Platform.GAMECUBE; sIsGameCubeGame = Platform.fromNativeInt(mPlatform) == Platform.GAMECUBE;