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 @@
  (Format: Year/Month/Day)
 Changes for 1.0.1:
 *07/10/22:
+   * Fixed crash bug at restart. ( Henrik )
+     Window.cc
    * Replaced modKey with new commands StartMoving and StartResizing (Mark)
      - your keys file should be updated automatically
      - 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,
 FluxboxWindow::~FluxboxWindow() {
     if (WindowCmd<void>::window() == this)
         WindowCmd<void>::setWindow(0);
+    if ( Fluxbox::instance()->keys() != 0 ) {
+        Fluxbox::instance()->keys()->
+            unregisterWindow(frame().window().window());
+    }
 
-    Fluxbox::instance()->keys()->unregisterWindow(frame().window().window());
 
 #ifdef DEBUG
     const char* title = m_client ? m_client->title().c_str() : "" ;