pokemon/gen1recomp
1
0
Fork 0
mirror of https://github.com/bryanthaboi/gen1recomp.git synced 2026-08-21 05:00:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix secondary display lifecycle cleanup

Browse Source
This commit is contained in:
AverageConsumer
2026-08-20 18:23:20 +02:00
parent 5fa5005786
commit 9e01fe2c2c
3 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/android/love/src/main/java/org/love2d/android/GameActivity.java
+14 -4
View File
@@ -398,11 +398,15 @@ public class GameActivity extends SDLActivity {
@Override
protected void onDestroy() {
secondaryHostResumed = false;
if (vibrator != null) {
Log.d("GameActivity", "Cancelling vibration");
vibrator.cancel();
}
unregisterSecondaryDisplayListener();
teardownSecondaryDisplay();
secondaryEnabled = false;
synchronized (secondaryFrameLock) { secondaryFrame = null; }
unregisterAudioDeviceCallback();
abandonAudioFocus();
onHostDestroy();
@@ -411,6 +415,7 @@ public class GameActivity extends SDLActivity {
@Override
protected void onPause() {
secondaryHostResumed = false;
if (vibrator != null) {
Log.d("GameActivity", "Cancelling vibration");
vibrator.cancel();
@@ -426,6 +431,7 @@ public class GameActivity extends SDLActivity {
@Override
public void onResume() {
super.onResume();
secondaryHostResumed = true;
onHostResume();
requestGameAudioFocus();
registerAudioDeviceCallback();
@@ -1933,6 +1939,7 @@ public class GameActivity extends SDLActivity {
private static volatile int secondaryActivityTarget = Display.INVALID_DISPLAY;
private static volatile long secondaryRetryAfter;
private static volatile boolean secondaryEnabled = false;
private static volatile boolean secondaryHostResumed = false;
private static volatile int secondaryTarget = SECONDARY_TARGET_AUTO;
private static volatile int dualScreenDisplayMode = -1;
private static volatile byte[] secondaryFrame;
@@ -1963,7 +1970,7 @@ public class GameActivity extends SDLActivity {
if (self == null) return;
self.runOnUiThread(new Runnable() {
@Override public void run() {
if (on) {
if (on && secondaryHostResumed) {
self.refreshDualScreenDisplayMode();
self.registerSecondaryDisplayListener();
rebindSecondaryDisplay();
@@ -2035,9 +2042,11 @@ public class GameActivity extends SDLActivity {
private static void rebindSecondaryDisplay() {
GameActivity self = (GameActivity) mSingleton;
if (self == null || !secondaryEnabled || secondaryOutputIsPreferred(self)) return;
if (self == null || !secondaryHostResumed || !secondaryEnabled
|| secondaryOutputIsPreferred(self)) return;
self.runOnUiThread(() -> {
if (!secondaryEnabled || secondaryOutputIsPreferred(self)) return;
if (!secondaryHostResumed || !secondaryEnabled
|| secondaryOutputIsPreferred(self)) return;
teardownSecondaryDisplay();
setupSecondaryDisplay();
});
@@ -2045,7 +2054,8 @@ public class GameActivity extends SDLActivity {
private static void setupSecondaryDisplay() {
GameActivity self = (GameActivity) mSingleton;
if (self == null || !secondaryEnabled || secondaryPresentation != null
if (self == null || !secondaryHostResumed || !secondaryEnabled
|| secondaryPresentation != null
|| secondaryActivity != null || secondaryActivityPending
|| android.os.SystemClock.elapsedRealtime() < secondaryRetryAfter) return;
try {