Prevent access of freed workspace in _workspace_show

[i3/i3] / src / output.c

diff --git a/src/output.c b/src/output.c
index e76903844821c532f14cca9b132beeb18ea3af93..c76dfd035d213360ef727663b3e98ff49fba6db4 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -99,7 +99,8 @@ void output_push_sticky_windows(Con *to_focus) {
                     continue;
 
                 if (con_is_sticky(current)) {
-                    con_move_to_workspace(current, visible_ws, true, false, current != to_focus->parent);
+                    bool ignore_focus = (to_focus == NULL) || (current != to_focus->parent);
+                    con_move_to_workspace(current, visible_ws, true, false, ignore_focus);
                 }
             }
         }