From fda4708a2857138aeb3c2cb2abb070300a88e456 Mon Sep 17 00:00:00 2001 From: David Griswold Date: Thu, 22 Jan 2026 11:41:37 +0300 Subject: [PATCH] update default displayid behavior to exclude "Built" --- .../java/org/citra/citra_emu/display/SecondaryDisplay.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/display/SecondaryDisplay.kt b/src/android/app/src/main/java/org/citra/citra_emu/display/SecondaryDisplay.kt index 13d347688..e5b0db0c5 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/display/SecondaryDisplay.kt +++ b/src/android/app/src/main/java/org/citra/citra_emu/display/SecondaryDisplay.kt @@ -88,13 +88,12 @@ class SecondaryDisplay(val context: Context) : DisplayManager.DisplayListener { currentDisplayId = -1 vd.display } else if (preferredDisplayId >=0 && displays.any { it.displayId == preferredDisplayId }) { - currentDisplayId = preferredDisplayId displays.first { it.displayId == preferredDisplayId } } else { - //TODO: re-enable the filter of "built-in displays" odin style to pick default - currentDisplayId = displays[0].displayId - displays[0] + // prioritize a display without the word "Built" in name if it exists + currentDisplayId = displays.firstOrNull{!it.name.contains("Built",true)}?.displayId ?: displays[0].displayId + displays.first{ it.displayId == currentDisplayId } } // if our presentation is already on the right display, ignore