From d309957927bacdffb1511b5f43ac065546dc0d02 Mon Sep 17 00:00:00 2001
From: bbedward <bbedward@gmail.com>
Date: Sun, 9 Nov 2025 10:35:16 -0500
Subject: [PATCH] add some null safety checks

---
 Modules/DankBar/Widgets/WorkspaceSwitcher.qml | 2 ++
 Modules/HyprWorkspaces/OverviewWidget.qml     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Modules/DankBar/Widgets/WorkspaceSwitcher.qml b/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
index 8eb1f28f..89bb0dd6 100644
--- a/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
+++ b/Modules/DankBar/Widgets/WorkspaceSwitcher.qml
@@ -687,6 +687,7 @@ Item {
                                             enabled: isActive
                                             cursorShape: Qt.PointingHandCursor
                                             onClicked: {
+                                                if (!appIcon.windowId) return
                                                 if (CompositorService.isHyprland) {
                                                     Hyprland.dispatch(`focuswindow address:${appIcon.windowId}`)
                                                 } else if (CompositorService.isNiri) {
@@ -755,6 +756,7 @@ Item {
                                             enabled: isActive
                                             cursorShape: Qt.PointingHandCursor
                                             onClicked: {
+                                                if (!appIcon.windowId) return
                                                 if (CompositorService.isHyprland) {
                                                     Hyprland.dispatch(`focuswindow address:${appIcon.windowId}`)
                                                 } else if (CompositorService.isNiri) {
diff --git a/Modules/HyprWorkspaces/OverviewWidget.qml b/Modules/HyprWorkspaces/OverviewWidget.qml
index 1b6233f2..92ab36e2 100644
--- a/Modules/HyprWorkspaces/OverviewWidget.qml
+++ b/Modules/HyprWorkspaces/OverviewWidget.qml
@@ -352,7 +352,7 @@ Item {
                         }
 
                         onClicked: (event) => {
-                            if (!windowData) return
+                            if (!windowData || !windowData.address) return
 
                             if (event.button === Qt.LeftButton) {
                                 root.overviewOpen = false