Preserve back_and_forth during restart

[i3/i3] / src / workspace.c

diff --git a/src/workspace.c b/src/workspace.c
index a2d9b0e8ae469068d8a92bffc20708cb81ce51e8..2af88d73de1f915d67717c530a9331393c1e3274 100644 (file)
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -11,9 +11,12 @@
 #include "all.h"
 #include "yajl_utils.h"
 
-/* Stores a copy of the name of the last used workspace for the workspace
- * back-and-forth switching. */
-static char *previous_workspace_name = NULL;
+/*
+ * Stores a copy of the name of the last used workspace for the workspace
+ * back-and-forth switching.
+ *
+ */
+char *previous_workspace_name = NULL;
 
 /* NULL-terminated list of workspace names (in order) extracted from
  * keybindings. */
@@ -972,7 +975,11 @@ bool workspace_move_to_output(Con *ws, Output *output) {
     LOG("got output %p with content %p\n", output, content);
 
     Con *previously_visible_ws = TAILQ_FIRST(&(content->focus_head));
-    LOG("Previously visible workspace = %p / %s\n", previously_visible_ws, previously_visible_ws->name);
+    if (previously_visible_ws) {
+        DLOG("Previously visible workspace = %p / %s\n", previously_visible_ws, previously_visible_ws->name);
+    } else {
+        DLOG("No previously visible workspace on output.\n");
+    }
 
     bool workspace_was_visible = workspace_is_visible(ws);
     if (con_num_children(ws->parent) == 1) {
@@ -1030,6 +1037,10 @@ bool workspace_move_to_output(Con *ws, Output *output) {
         workspace_show(ws);
     }
 
+    if (!previously_visible_ws) {
+        return true;
+    }
+
     /* NB: We cannot simply work with previously_visible_ws since it might
      * have been cleaned up by workspace_show() already, depending on the
      * focus order/number of other workspaces on the output.