From 576eac5e2f908e50183a8a996781cedf6682bbd4 Mon Sep 17 00:00:00 2001 From: OpenSauce04 Date: Tue, 9 Dec 2025 15:13:56 +0000 Subject: [PATCH] Moved `enforceRefreshRate` SDK version check to within the function --- .../java/org/citra/citra_emu/activities/EmulationActivity.kt | 4 +--- .../citra/citra_emu/features/settings/ui/SettingsActivity.kt | 4 +--- .../main/java/org/citra/citra_emu/ui/main/MainActivity.kt | 4 +--- .../main/java/org/citra/citra_emu/utils/RefreshRateUtil.kt | 5 ++++- 4 files changed, 7 insertions(+), 10 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 ac861d4f5..d060c59bb 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,9 +84,7 @@ class EmulationActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { requestWindowFeature(Window.FEATURE_NO_TITLE) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) { - RefreshRateUtil.enforceRefreshRate(this, sixtyHz = true) - } + RefreshRateUtil.enforceRefreshRate(this, sixtyHz = true) ThemeUtil.setTheme(this) settingsViewModel.settings.loadSettings() 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 f1976d1c0..064fa700e 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,9 +51,7 @@ 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) - } + RefreshRateUtil.enforceRefreshRate(this) ThemeUtil.setTheme(this) 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 75f24670c..71e07225b 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,9 +68,7 @@ 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) - } + RefreshRateUtil.enforceRefreshRate(this) val splashScreen = installSplashScreen() CitraDirectoryUtils.attemptAutomaticUpdateDirectory() diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/RefreshRateUtil.kt b/src/android/app/src/main/java/org/citra/citra_emu/utils/RefreshRateUtil.kt index f5491a461..675fe6702 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/RefreshRateUtil.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/RefreshRateUtil.kt @@ -18,8 +18,11 @@ object RefreshRateUtil { // but is instead the refresh rate chosen by the user in the Android system settings. // For example, if the user selected 120hz in the settings, but the display is capable // of 144hz, 120hz will be treated as the maximum within this function. - @RequiresApi(Build.VERSION_CODES.R) fun enforceRefreshRate(activity: Activity, sixtyHz: Boolean = false) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) { + return + } + val display = activity.display val window = activity.window