mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-04-03 20:32:07 -04:00
dankbar: guard against nil screen names
This commit is contained in:
@@ -275,7 +275,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;
|
||||
});
|
||||
@@ -298,7 +298,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;
|
||||
});
|
||||
@@ -322,7 +322,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;
|
||||
});
|
||||
@@ -346,7 +346,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;
|
||||
});
|
||||
@@ -672,6 +672,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];
|
||||
|
||||
Reference in New Issue
Block a user