From be771e12aa7278c84fcbcc2d3197a49d6b4e36c7 Mon Sep 17 00:00:00 2001 From: izzy2lost Date: Mon, 9 Mar 2026 16:00:01 -0400 Subject: [PATCH] fix some errors on some devices --- android/app/build.gradle.kts | 4 ++-- android/app/src/main/cpp/CMakeLists.txt | 4 ++-- .../src/main/java/com/izzy2lost/x1box/GameLibraryActivity.kt | 4 +++- .../app/src/main/java/com/izzy2lost/x1box/LauncherActivity.kt | 4 +++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index bbffe22682..44576eec47 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -44,8 +44,8 @@ android { "-DXEMU_ENABLE_XISO_CONVERTER=ON", "-DCMAKE_C_FLAGS_DEBUG=-O2 -g0", "-DCMAKE_CXX_FLAGS_DEBUG=-O2 -g0", - "-DCMAKE_C_FLAGS_RELEASE=-O3 -g0 -march=armv8.2-a -ffunction-sections -fdata-sections", - "-DCMAKE_CXX_FLAGS_RELEASE=-O3 -g0 -march=armv8.2-a -ffunction-sections -fdata-sections", + "-DCMAKE_C_FLAGS_RELEASE=-O2 -g0 -march=armv8-a -ffunction-sections -fdata-sections", + "-DCMAKE_CXX_FLAGS_RELEASE=-O2 -g0 -march=armv8-a -ffunction-sections -fdata-sections", "-DCMAKE_EXE_LINKER_FLAGS_RELEASE=-Wl,--gc-sections", "-DCMAKE_SHARED_LINKER_FLAGS_RELEASE=-Wl,--gc-sections" ) diff --git a/android/app/src/main/cpp/CMakeLists.txt b/android/app/src/main/cpp/CMakeLists.txt index e31303b033..8d66c318d3 100644 --- a/android/app/src/main/cpp/CMakeLists.txt +++ b/android/app/src/main/cpp/CMakeLists.txt @@ -867,7 +867,7 @@ target_compile_definitions(xemu_core PRIVATE target_compile_options(xemu_core PRIVATE -g0 $<$,$,$>:-UNDEBUG> - $<$,$>:-O3 -march=armv8.2-a -ffunction-sections -fdata-sections> + $<$,$>:-O2 -march=armv8-a -ffunction-sections -fdata-sections> ) target_include_directories(xemu_core PRIVATE @@ -937,7 +937,7 @@ endif() target_compile_options(xemu PRIVATE -fexceptions -frtti -g0 $<$,$,$>:-UNDEBUG> - $<$,$>:-O3 -march=armv8.2-a -ffunction-sections -fdata-sections> + $<$,$>:-O2 -march=armv8-a -ffunction-sections -fdata-sections> ) target_link_options(xemu PRIVATE diff --git a/android/app/src/main/java/com/izzy2lost/x1box/GameLibraryActivity.kt b/android/app/src/main/java/com/izzy2lost/x1box/GameLibraryActivity.kt index 62767d1742..8fe01cb71c 100644 --- a/android/app/src/main/java/com/izzy2lost/x1box/GameLibraryActivity.kt +++ b/android/app/src/main/java/com/izzy2lost/x1box/GameLibraryActivity.kt @@ -1087,11 +1087,13 @@ class GameLibraryActivity : AppCompatActivity() { private fun launchGame(game: GameEntry) { persistUriPermission(game.uri) + // MainActivity runs in :xemu, so the disc selection must be flushed before + // the other process reads SharedPreferences during startup. prefs.edit() .putString("dvdUri", game.uri.toString()) .remove("dvdPath") .putBoolean("skip_game_picker", false) - .apply() + .commit() startActivity(Intent(this, MainActivity::class.java)) finish() diff --git a/android/app/src/main/java/com/izzy2lost/x1box/LauncherActivity.kt b/android/app/src/main/java/com/izzy2lost/x1box/LauncherActivity.kt index 025d7240a3..3104095353 100644 --- a/android/app/src/main/java/com/izzy2lost/x1box/LauncherActivity.kt +++ b/android/app/src/main/java/com/izzy2lost/x1box/LauncherActivity.kt @@ -93,6 +93,8 @@ class LauncherActivity : Activity() { if (frontendLaunch.dvdUri != null) { FrontendLaunchHelper.persistReadPermission(this, intent, frontendLaunch.dvdUri) } + // MainActivity runs in :xemu, so launch data must be flushed before + // handing off to the emulator process. prefs.edit() .putBoolean("skip_game_picker", false) .apply { @@ -107,7 +109,7 @@ class LauncherActivity : Activity() { } } } - .apply() + .commit() if (hasMcpx && hasFlash && hasHdd) { Log.i(TAG, "Frontend launch resolved via ${frontendLaunch.source}")