Merge branch 'master' into next

2012-09-14 13:18:04 +02:00
parent 22922a9e70 0929f68a10
commit 794783defb
3 changed files with 24 additions and 2 deletions
--- a/src/scratchpad.c
+++ b/src/scratchpad.c
@ -60,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);
 }

 /*