aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2007-10-22 17:48:53 (GMT)
committerfluxgen <fluxgen>2007-10-22 17:48:53 (GMT)
commit41aec985ce641575381e3c6015c4ed95246d443b (patch)
tree4019a3e81343bc53fb1caab8bf08d41ac75ad772
parentc6a2605d76927eed881e4ff9df58a9ec600bf4a2 (diff)
downloadfluxbox-41aec985ce641575381e3c6015c4ed95246d443b.zip
fluxbox-41aec985ce641575381e3c6015c4ed95246d443b.tar.bz2
we can be in shutdown state, which means keys can be destroyed
-rw-r--r--ChangeLog2
-rw-r--r--src/Window.cc5
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0644aad..eb3c57f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.1: 2Changes for 1.0.1:
3*07/10/22: 3*07/10/22:
4 * Fixed crash bug at restart. ( Henrik )
5 Window.cc
4 * Replaced modKey with new commands StartMoving and StartResizing (Mark) 6 * Replaced modKey with new commands StartMoving and StartResizing (Mark)
5 - your keys file should be updated automatically 7 - your keys file should be updated automatically
6 - they must be used with a mouse button, or they won't work 8 - they must be used with a mouse button, or they won't work
diff --git a/src/Window.cc b/src/Window.cc
index dbd945f..133ccd2 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -295,8 +295,11 @@ FluxboxWindow::FluxboxWindow(WinClient &client, FbWinFrameTheme &tm,
295FluxboxWindow::~FluxboxWindow() { 295FluxboxWindow::~FluxboxWindow() {
296 if (WindowCmd<void>::window() == this) 296 if (WindowCmd<void>::window() == this)
297 WindowCmd<void>::setWindow(0); 297 WindowCmd<void>::setWindow(0);
298 if ( Fluxbox::instance()->keys() != 0 ) {
299 Fluxbox::instance()->keys()->
300 unregisterWindow(frame().window().window());
301 }
298 302
299 Fluxbox::instance()->keys()->unregisterWindow(frame().window().window());
300 303
301#ifdef DEBUG 304#ifdef DEBUG
302 const char* title = m_client ? m_client->title().c_str() : "" ; 305 const char* title = m_client ? m_client->title().c_str() : "" ;