ZacharyZhang-NY/omarchycn
2
2
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #6221 from kevinmcconnell/systray-action-fix

Browse Source 
Fix bar plugin array guards
This commit is contained in:
David Heinemeier Hansson
2026-07-14 11:05:22 -07:00
committed by GitHub
parent 07568e165a d5492db404
commit d25abba046
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shell/plugins/bar/widgets/Tray.qml
+2 -2
View File
@@ -18,8 +18,8 @@ BarWidget {
property var activeTrayAnchor: null
readonly property color foreground: bar ? bar.foreground : Color.foreground
readonly property string fontFamily: bar ? bar.fontFamily : Style.font.family
readonly property var pinnedIds: Array.isArray(settings.pinned) ? settings.pinned : []
readonly property var hiddenIds: Array.isArray(settings.hidden) ? settings.hidden : []
readonly property var pinnedIds: settings.pinned instanceof Array ? settings.pinned : []
readonly property var hiddenIds: settings.hidden instanceof Array ? settings.hidden : []
readonly property var pinnedItems: bucket("pinned")
readonly property var drawerItems: bucket("drawer")
readonly property var allItems: bucket("all")
shell/plugins/panels/tailscale/Panel.qml
+1 -1
View File
@@ -44,7 +44,7 @@ Panel {
readonly property string fontFamily: bar ? bar.fontFamily : Style.font.family
readonly property bool showConnections: tailscale.accounts.length > 1 || tailscale.accountsAccessDenied
readonly property bool showPeers: tailscale.running && tailscale.peers.length > 0
readonly property var recentMullvadRegions: Array.isArray(settings.recentMullvadRegions) ? settings.recentMullvadRegions : (Array.isArray(settings.recentMullvadCountries) ? settings.recentMullvadCountries : [])
readonly property var recentMullvadRegions: settings.recentMullvadRegions instanceof Array ? settings.recentMullvadRegions : (settings.recentMullvadCountries instanceof Array ? settings.recentMullvadCountries : [])
readonly property var recentMullvadExitNodes: recentMullvadNodes()
readonly property var exitNodes: displayExitNodes()
readonly property bool showExitNodes: tailscale.running && (exitNodes.length > 0 || tailscale.mullvadRegions.length > 0)