Fix bug: workspace.nodeMonitor returns nil

User observable: $ aerospace list-workspaces --visible --monitor focused --format '%{monitor-id}' NULL-MONITOR
nikitabobko · Jul 28, 2024 · 238da9b · 238da9b
1 parent 1e33cf6
commit 238da9b
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/Sources/AppBundle/tree/TreeNodeEx.swift b/Sources/AppBundle/tree/TreeNodeEx.swift
@@ -33,10 +33,11 @@ extension TreeNode {
     var visualWorkspace: Workspace? { workspace ?? nodeMonitor?.activeWorkspace }
 
     var nodeMonitor: Monitor? {
-        guard let parent else { return nil }
-        return switch parent.cases {
-            case .workspace(let parent): parent.workspaceMonitor
-            case .tilingContainer, .macosFullscreenWindowsContainer: parent.nodeMonitor
+        switch self.nodeCases {
+            case .workspace(let ws): ws.workspaceMonitor
+            case .window: parent?.nodeMonitor
+            case .tilingContainer: parent?.nodeMonitor
+            case .macosFullscreenWindowsContainer: parent?.nodeMonitor
             case .macosInvisibleWindowsContainer, .macosPopupWindowsContainer: nil
         }
     }