From bebd2fceb6a4d9c01731186ae4d9bb3ac79b91a8 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Thu, 10 Nov 2011 18:42:24 +0000
Subject: [PATCH] Bugfix: Correctly return to initial state after
 prev/next/back_and_forth (Thanks Brian)

Fixes: #552
---
 src/cmdparse.l                        |  6 +++---
 testcases/t/179-regress-multiple-ws.t | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 testcases/t/179-regress-multiple-ws.t

diff --git a/src/cmdparse.l b/src/cmdparse.l
index 6dda34d0..9a5b3d7b 100644
--- a/src/cmdparse.l
+++ b/src/cmdparse.l
@@ -74,9 +74,9 @@ EOL (\r?\n)
 
     /* the next/prev/back_and_forth tokens are here to recognize them *before*
      * handling strings ('workspace' command) */
-next                            { return TOK_NEXT; }
-prev                            { return TOK_PREV; }
-back_and_forth                  { return TOK_BACK_AND_FORTH; }
+next                            { BEGIN(INITIAL); return TOK_NEXT; }
+prev                            { BEGIN(INITIAL); return TOK_PREV; }
+back_and_forth                  { BEGIN(INITIAL); return TOK_BACK_AND_FORTH; }
 
 <WANT_STRING>\"[^\"]+\"         {
                                   BEGIN(INITIAL);
diff --git a/testcases/t/179-regress-multiple-ws.t b/testcases/t/179-regress-multiple-ws.t
new file mode 100644
index 00000000..21271170
--- /dev/null
+++ b/testcases/t/179-regress-multiple-ws.t
@@ -0,0 +1,25 @@
+#!perl
+# vim:ts=4:sw=4:expandtab
+#
+# The command "move workspace prev; workspace prev" will lead to an error.
+# This regression is present in 7f9b65f6a752e454c492447be4e21e2ee8faf8fd
+use i3test;
+
+my $i3 = i3(get_socket_path());
+
+# Open one workspace to move the con to
+my $old = fresh_workspace;
+my $keep_open_con = open_empty_con($i3);
+
+# Get a workspace and open a container
+my $tmp = fresh_workspace;
+my $con = open_empty_con($i3);
+
+is(@{get_ws_content($tmp)}, 1, 'one container');
+is(@{get_ws_content($old)}, 1, 'one container on old ws');
+
+cmd 'move workspace prev; workspace prev';
+
+is(@{get_ws_content($old)}, 2, 'container moved away');
+
+done_testing;
-- 
2.39.5