Merge branch 'master' into next

[i3/i3] / src / scratchpad.c

diff --git a/src/scratchpad.c b/src/scratchpad.c
index da50cee76442c5d8c9d712065adc7896ee0625d0..5072280bf35b47fbc1b99c55e0f234c83a445740 100644 (file)
--- a/src/scratchpad.c
+++ b/src/scratchpad.c
@@ -1,4 +1,5 @@
-#line 2 "scratchpad.c"
+#undef I3__FILE__
+#define I3__FILE__ "scratchpad.c"
 /*
  * vim:ts=4:sw=4:expandtab
  *
@@ -59,7 +60,8 @@ void scratchpad_move(Con *con) {
 
     /* 4: Fix focus. Normally, when moving a window to a different output, the
      * destination output gets focused. In this case, we don’t want that. */
-    con_focus(focus_next);
+    if (con_get_workspace(focus_next) == con_get_workspace(focused))
+        con_focus(focus_next);
 }
 
 /*