#1577 fix issue with window warp

koekeishiya · Dec 27, 2022 · 86f1e91 · 86f1e91
1 parent 53c426d
commit 86f1e91
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ## [Unreleased]
 ### Changed
 - Fixed issue with window focusing caused by incorrectly intercepting a synthesized mouse event [#1551](https://github.com/koekeishiya/yabai/issues/1551)
+- Fixed issue with window warping across displays with only a single window tiled at both displays [#1577](https://github.com/koekeishiya/yabai/issues/1577)
 
 ## [5.0.2] - 2022-12-16
 ### Changed

diff --git a/src/window_manager.c b/src/window_manager.c
@@ -1648,7 +1648,9 @@ enum window_op_error window_manager_warp_window(struct space_manager *sm, struct
 
     if (a_node == b_node) return WINDOW_OP_ERROR_SAME_STACK;
 
-    if (a_node->parent == b_node->parent && a_node->window_count == 1) {
+    if (a_node->parent && b_node->parent &&
+        a_node->parent == b_node->parent &&
+        a_node->window_count == 1) {
         if (window_node_contains_window(b_node, b_view->insertion_point)) {
             b_node->parent->split = b_node->split;
             b_node->parent->child = b_node->child;