summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-11-15 00:20:18 +0100
committerGitHub <noreply@github.com>2023-11-15 00:20:18 +0100
commitbe0ecae108ba2e011f244156faf14513a4b98834 (patch)
treea365b2b1fd19f00fb20869d94b5eed64d6833759
parentMerge pull request #12032 from liamwhite/fruit-compiler (diff)
parentandroid: Don't enter PiP during startup or shutdown (diff)
downloadyuzu-be0ecae108ba2e011f244156faf14513a4b98834.tar
yuzu-be0ecae108ba2e011f244156faf14513a4b98834.tar.gz
yuzu-be0ecae108ba2e011f244156faf14513a4b98834.tar.bz2
yuzu-be0ecae108ba2e011f244156faf14513a4b98834.tar.lz
yuzu-be0ecae108ba2e011f244156faf14513a4b98834.tar.xz
yuzu-be0ecae108ba2e011f244156faf14513a4b98834.tar.zst
yuzu-be0ecae108ba2e011f244156faf14513a4b98834.zip
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
index 054e4b755..f41d7bdbf 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
@@ -373,8 +373,10 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
val pictureInPictureParamsBuilder = PictureInPictureParams.Builder()
.getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ val isEmulationActive = emulationViewModel.emulationStarted.value &&
+ !emulationViewModel.isEmulationStopping.value
pictureInPictureParamsBuilder.setAutoEnterEnabled(
- BooleanSetting.PICTURE_IN_PICTURE.boolean
+ BooleanSetting.PICTURE_IN_PICTURE.boolean && isEmulationActive
)
}
setPictureInPictureParams(pictureInPictureParamsBuilder.build())