koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scratchpad: fix crash when moving last window of an invisible workspace (+test) (Thanks bafain)

Browse Source 
It looks like the code which was removed with this commit was not
necessary anyways since con_move_to_workspace() by now checks on its own
whether it moves to the scratchpad.

fixes #913
This commit is contained in:
Michael Stapelberg
2013-01-25 15:26:53 +01:00
parent f767ac30b3
commit a32d2d5d61
2 changed files with 66 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/scratchpad.c
View File

@ -4,7 +4,7 @@
* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
* © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE)
* © 2009-2013 Michael Stapelberg and contributors (see also: LICENSE)
*
* scratchpad.c: Moving windows to the scratchpad and making them visible again.
*
@ -53,7 +53,6 @@ void scratchpad_move(Con *con) {
/* 2: Send the window to the __i3_scratch workspace, mainting its
* coordinates and not warping the pointer. */
Con *focus_next = con_next_focused(con);
con_move_to_workspace(con, __i3_scratch, true, true);
/* 3: If this is the first time this window is used as a scratchpad, we set
@ -63,11 +62,6 @@ void scratchpad_move(Con *con) {
DLOG("This window was never used as a scratchpad before.\n");
con->scratchpad_state = SCRATCHPAD_FRESH;
}
/* 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. */
if (con_get_workspace(focus_next) == con_get_workspace(focused))
con_focus(focus_next);
}
/*