aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrathnor <rathnor>2003-09-24 14:26:01 (GMT)
committerrathnor <rathnor>2003-09-24 14:26:01 (GMT)
commit2c8e8e59151d808747a4dc2fd3001154a68cd015 (patch)
treeb67f20d5d226f3f5f10bd8f2d82221d806ed33f1
parentfeb7462e381b4015bc736e90da87dc7cc5711b1a (diff)
downloadfluxbox-2c8e8e59151d808747a4dc2fd3001154a68cd015.zip
fluxbox-2c8e8e59151d808747a4dc2fd3001154a68cd015.tar.bz2
fix crash when closing active window while cycling focus
-rw-r--r--ChangeLog2
-rw-r--r--src/Screen.cc5
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 19f5dfb..5fed768 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.6: 2Changes for 0.9.6:
3*03/09/24: 3*03/09/24:
4 * Fix crash when closing active window while cycling focus (Simon)
5 Screen.cc
4 * Fix updates to mwm_hints, and make configure request 6 * Fix updates to mwm_hints, and make configure request
5 move and resize atomic (Simon) 7 move and resize atomic (Simon)
6 - fixes mplayer fullscreen window being moveable 8 - fixes mplayer fullscreen window being moveable
diff --git a/src/Screen.cc b/src/Screen.cc
index b2b35ca..ade286d 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.233 2003/09/14 10:13:54 fluxgen Exp $ 25// $Id: Screen.cc,v 1.234 2003/09/24 14:26:01 rathnor Exp $
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -744,6 +744,9 @@ void BScreen::removeClient(WinClient &client) {
744 Fluxbox::instance()->revertFocus(focused->screen()); 744 Fluxbox::instance()->revertFocus(focused->screen());
745 } 745 }
746 746
747 if (cycling_last == &client)
748 cycling_last = 0;
749
747 for_each(getWorkspacesList().begin(), getWorkspacesList().end(), 750 for_each(getWorkspacesList().begin(), getWorkspacesList().end(),
748 mem_fun(&Workspace::updateClientmenu)); 751 mem_fun(&Workspace::updateClientmenu));
749 752