From ff4100fe3487aa76431f8c5e535a4393351a5565 Mon Sep 17 00:00:00 2001 From: OpenSauce04 Date: Tue, 9 Dec 2025 15:05:12 +0000 Subject: [PATCH] Moved `enforceRefreshRate` calls to earlier in `onCreate` This probably doesn't actually do anything, it's a bit of a nitpick --- .../org/citra/citra_emu/activities/EmulationActivity.kt | 4 ++-- .../citra_emu/features/settings/ui/SettingsActivity.kt | 9 ++++----- .../java/org/citra/citra_emu/ui/main/MainActivity.kt | 9 ++++----- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt index 9ede0865d..ac861d4f5 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.kt @@ -84,12 +84,12 @@ class EmulationActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { requestWindowFeature(Window.FEATURE_NO_TITLE) - ThemeUtil.setTheme(this) - settingsViewModel.settings.loadSettings() if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { RefreshRateUtil.enforceRefreshRate(this, sixtyHz = true) } + ThemeUtil.setTheme(this) + settingsViewModel.settings.loadSettings() super.onCreate(savedInstanceState) secondaryDisplay = SecondaryDisplay(this) secondaryDisplay.updateDisplay() diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.kt index 1ae781920..f1976d1c0 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.kt @@ -51,16 +51,15 @@ class SettingsActivity : AppCompatActivity(), SettingsActivityView { override val settings: Settings get() = settingsViewModel.settings override fun onCreate(savedInstanceState: Bundle?) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + RefreshRateUtil.enforceRefreshRate(this) + } + ThemeUtil.setTheme(this) super.onCreate(savedInstanceState) binding = ActivitySettingsBinding.inflate(layoutInflater) - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - RefreshRateUtil.enforceRefreshRate(this) - } - setContentView(binding.root) WindowCompat.setDecorFitsSystemWindows(window, false) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.kt b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.kt index 9426b55cd..75f24670c 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.kt @@ -68,6 +68,10 @@ class MainActivity : AppCompatActivity(), ThemeProvider { override var themeId: Int = 0 override fun onCreate(savedInstanceState: Bundle?) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { + RefreshRateUtil.enforceRefreshRate(this) + } + val splashScreen = installSplashScreen() CitraDirectoryUtils.attemptAutomaticUpdateDirectory() splashScreen.setKeepOnScreenCondition { @@ -88,11 +92,6 @@ class MainActivity : AppCompatActivity(), ThemeProvider { super.onCreate(savedInstanceState) binding = ActivityMainBinding.inflate(layoutInflater) - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - RefreshRateUtil.enforceRefreshRate(this) - } - setContentView(binding.root) WindowCompat.setDecorFitsSystemWindows(window, false)