1 files changed, 2 insertions, 3 deletions

diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index fa68d00..9e62ac3 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -427,11 +427,10 @@ Fluxbox::~Fluxbox() {
     // key commands cause a segfault when the XLayerItem is destroyed
     m_key.reset(0);
 
+    leaveAll(); // leave all connections
+
     // destroy screens (after others, as they may do screen things)
     while (!m_screen_list.empty()) {
-        // this needs to be done before the signal is destroyed
-        leave( m_screen_list.back()->workspaceCountSig() );
-
         delete m_screen_list.back();
         m_screen_list.pop_back();
     }