From f0be36062e8e4679cec79651ddace96f73c8bff2 Mon Sep 17 00:00:00 2001 From: bbedward Date: Mon, 16 Mar 2026 11:32:59 -0400 Subject: [PATCH] dankbar: guard against nil screen names --- quickshell/Modules/DankBar/DankBarWindow.qml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/quickshell/Modules/DankBar/DankBarWindow.qml b/quickshell/Modules/DankBar/DankBarWindow.qml index 88a9e716..48abc425 100644 --- a/quickshell/Modules/DankBar/DankBarWindow.qml +++ b/quickshell/Modules/DankBar/DankBarWindow.qml @@ -289,7 +289,7 @@ PanelWindow { const onThisScreen = bc.screenPreferences.includes(screenName) || bc.screenPreferences.length === 0 || bc.screenPreferences.includes("all"); if (!onThisScreen) return false; - if (bc.showOnLastDisplay && screenName !== barWindow.screen.name) + if (bc.showOnLastDisplay && screenName !== barWindow.screenName) return false; return true; }); @@ -312,7 +312,7 @@ PanelWindow { const onThisScreen = bc.screenPreferences.includes(screenName) || bc.screenPreferences.length === 0 || bc.screenPreferences.includes("all"); if (!onThisScreen) return false; - if (bc.showOnLastDisplay && screenName !== barWindow.screen.name) + if (bc.showOnLastDisplay && screenName !== barWindow.screenName) return false; return true; }); @@ -336,7 +336,7 @@ PanelWindow { const onThisScreen = bc.screenPreferences.includes(screenName) || bc.screenPreferences.length === 0 || bc.screenPreferences.includes("all"); if (!onThisScreen) return false; - if (bc.showOnLastDisplay && screenName !== barWindow.screen.name) + if (bc.showOnLastDisplay && screenName !== barWindow.screenName) return false; return true; }); @@ -360,7 +360,7 @@ PanelWindow { const onThisScreen = bc.screenPreferences.includes(screenName) || bc.screenPreferences.length === 0 || bc.screenPreferences.includes("all"); if (!onThisScreen) return false; - if (bc.showOnLastDisplay && screenName !== barWindow.screen.name) + if (bc.showOnLastDisplay && screenName !== barWindow.screenName) return false; return true; }); @@ -686,6 +686,7 @@ PanelWindow { onHasActivePopoutChanged: evaluateReveal() function updateActivePopoutState() { + if (!barWindow.screen) return; const screenName = barWindow.screen.name; const activePopout = PopoutManager.currentPopoutsByScreen[screenName]; const activeTrayMenu = TrayMenuManager.activeTrayMenus[screenName];