dahjah/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2026-06-03 05:35:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix startup crash

Browse Source
This commit is contained in:
David Griswold 2026-04-07 12:30:30 +03:00
parent 7f94e80e8d
commit b229e33e4b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,14 +93,16 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
if (PermissionsHandler.hasWriteAccess(applicationContext) && if (PermissionsHandler.hasWriteAccess(applicationContext) &&
DirectoryInitialization.areCitraDirectoriesReady() && DirectoryInitialization.areCitraDirectoriesReady() &&
!CitraDirectoryUtils.needToUpdateManually()) { !CitraDirectoryUtils.needToUpdateManually()) {
// load the global settings from the config file at program launch
// if the directory is available
SettingsFile.loadSettings(Settings.settings)
} }
ThemeUtil.ThemeChangeListener(this) ThemeUtil.ThemeChangeListener(this)
ThemeUtil.setTheme(this) ThemeUtil.setTheme(this)
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
// load the global settings from the config file at program launch
SettingsFile.loadSettings(Settings.settings)
binding = ActivityMainBinding.inflate(layoutInflater) binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root) setContentView(binding.root)
@ -273,6 +275,7 @@ class MainActivity : AppCompatActivity(), ThemeProvider {
fun finishSetup(navController: NavController) { fun finishSetup(navController: NavController) {
navController.navigate(R.id.action_firstTimeSetupFragment_to_gamesFragment) navController.navigate(R.id.action_firstTimeSetupFragment_to_gamesFragment)
(binding.navigationView as NavigationBarView).setupWithNavController(navController) (binding.navigationView as NavigationBarView).setupWithNavController(navController)
SettingsFile.loadSettings(Settings.settings)
} }
private fun setUpNavigation(savedInstanceState: Bundle?, navController: NavController) { private fun setUpNavigation(savedInstanceState: Bundle?, navController: NavController) {