Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: MainActivity: Move theme setup to after settings initialization.

Browse Source 
- Fixes a crash.
This commit is contained in:
bunnei 2020-04-21 21:58:45 -04:00
parent d488620fb5
commit 25e95aa774
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java
View File

@ -48,12 +48,14 @@ public final class MainActivity extends AppCompatActivity implements MainView {
mPresenter.onCreate(); mPresenter.onCreate();
if (savedInstanceState == null) { if (savedInstanceState == null) {
ThemeUtil.applyTheme();
StartupHandler.HandleInit(this); StartupHandler.HandleInit(this);
if (PermissionsHandler.hasWriteAccess(this)) { if (PermissionsHandler.hasWriteAccess(this)) {
mPlatformGamesFragment = new PlatformGamesFragment(); mPlatformGamesFragment = new PlatformGamesFragment();
getSupportFragmentManager().beginTransaction().add(mFrameLayoutId, mPlatformGamesFragment) getSupportFragmentManager().beginTransaction().add(mFrameLayoutId, mPlatformGamesFragment)
.commit(); .commit();
// Apply current theme setting
ThemeUtil.applyTheme();
} }
} else { } else {
mPlatformGamesFragment = (PlatformGamesFragment) getSupportFragmentManager().getFragment(savedInstanceState, "mPlatformGamesFragment"); mPlatformGamesFragment = (PlatformGamesFragment) getSupportFragmentManager().getFragment(savedInstanceState, "mPlatformGamesFragment");