ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: Fix crash on instant rotate 

Delay the creation of the emulation fragment if: the device is a phone, if
emulation should be locked to landscape, and the current orientation is
portrait.
This commit is contained in:
zackhow 2018-11-06 17:05:43 -05:00
parent 710b893b91
commit 0446a58ec5
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,6 +185,10 @@ public final class EmulationActivity extends AppCompatActivity
{ {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
// Find the EmulationFragment
mEmulationFragment = (EmulationFragment) getSupportFragmentManager()
.findFragmentById(R.id.frame_emulation_fragment);
if (savedInstanceState == null) if (savedInstanceState == null)
{ {
// Get params we were passed // Get params we were passed
@ -196,7 +200,9 @@ public final class EmulationActivity extends AppCompatActivity
} }
else else
{ {
activityRecreated = true; // Could have recreated the activity(rotate) before creating the fragment. If the fragment
// doesn't exist, treat this as a new start.
activityRecreated = mEmulationFragment != null;
restoreState(savedInstanceState); restoreState(savedInstanceState);
} }
@ -212,13 +218,6 @@ public final class EmulationActivity extends AppCompatActivity
int themeId; int themeId;
if (mDeviceHasTouchScreen) if (mDeviceHasTouchScreen)
{ {
BooleanSetting lockLandscape =
(BooleanSetting) mSettings.getSection(Settings.SECTION_INI_CORE)
.getSetting(SettingsFile.KEY_LOCK_LANDSCAPE);
// Force landscape if set
if (lockLandscape == null || lockLandscape.getValue())
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
themeId = R.style.DolphinEmulationBase; themeId = R.style.DolphinEmulationBase;
// Get a handle to the Window containing the UI. // Get a handle to the Window containing the UI.
@ -250,10 +249,20 @@ public final class EmulationActivity extends AppCompatActivity
setContentView(R.layout.activity_emulation); setContentView(R.layout.activity_emulation);
// Find or create the EmulationFragment
mEmulationFragment = (EmulationFragment) getSupportFragmentManager() BooleanSetting lockLandscapeSetting =
.findFragmentById(R.id.frame_emulation_fragment); (BooleanSetting) mSettings.getSection(Settings.SECTION_INI_CORE)
if (mEmulationFragment == null) .getSetting(SettingsFile.KEY_LOCK_LANDSCAPE);
boolean lockLandscape = lockLandscapeSetting == null || lockLandscapeSetting.getValue();
// Force landscape if set
if (mDeviceHasTouchScreen && lockLandscape)
{
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE);
}
if (!(mDeviceHasTouchScreen && lockLandscape &&
getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) &&
mEmulationFragment == null)
{ {
mEmulationFragment = EmulationFragment.newInstance(mPath); mEmulationFragment = EmulationFragment.newInstance(mPath);
getSupportFragmentManager().beginTransaction() getSupportFragmentManager().beginTransaction()