diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt | 4 |
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 { | |||
| 373 | val pictureInPictureParamsBuilder = PictureInPictureParams.Builder() | 373 | val pictureInPictureParamsBuilder = PictureInPictureParams.Builder() |
| 374 | .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder() | 374 | .getPictureInPictureActionsBuilder().getPictureInPictureAspectBuilder() |
| 375 | if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { | 375 | if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { |
| 376 | val isEmulationActive = emulationViewModel.emulationStarted.value && | ||
| 377 | !emulationViewModel.isEmulationStopping.value | ||
| 376 | pictureInPictureParamsBuilder.setAutoEnterEnabled( | 378 | pictureInPictureParamsBuilder.setAutoEnterEnabled( |
| 377 | BooleanSetting.PICTURE_IN_PICTURE.boolean | 379 | BooleanSetting.PICTURE_IN_PICTURE.boolean && isEmulationActive |
| 378 | ) | 380 | ) |
| 379 | } | 381 | } |
| 380 | setPictureInPictureParams(pictureInPictureParamsBuilder.build()) | 382 | setPictureInPictureParams(pictureInPictureParamsBuilder.build()) |