diff options
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java index 226e022988..d3ee8ddebf 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java @@ -217,8 +217,6 @@ public final class EmulationActivity extends AppCompatActivity 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 @@ public final class EmulationActivity extends AppCompatActivity 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; |