1 files changed, 13 insertions, 1 deletions

diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index 6b4f64a..c4c441e 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -219,7 +219,8 @@ WinClient *FocusControl::lastFocusedWindow(FluxboxWindow &group, WinClient *igno
 void FocusControl::setScreenFocusedWindow(WinClient &win_client) {
 
      // raise newly focused window to the top of the focused list
-    if (!m_cycling_focus) { // don't change the order if we're cycling
+     // don't change the order if we're cycling or shutting down
+    if (!m_cycling_focus && !win_client.screen().isShuttingdown()) {
         m_focused_list.remove(&win_client);
         m_focused_list.push_front(&win_client);
         m_cycling_window = m_focused_list.begin();
@@ -334,6 +335,9 @@ void FocusControl::dirFocus(FluxboxWindow &win, FocusDir dir) {
 }
 
 void FocusControl::removeClient(WinClient &client) {
+    if (client.screen().isShuttingdown())
+        return;
+
     WinClient *cyc = 0;
     if (m_cycling_window != m_focused_list.end() && m_cycling_window != m_creation_order_list.end())
         cyc = *m_cycling_window;
@@ -347,6 +351,14 @@ void FocusControl::removeClient(WinClient &client) {
     }
 }
 
+void FocusControl::shutdown() {
+    FocusedWindows::iterator it = m_focused_list.begin();
+    for (; it != m_focused_list.end(); ++it) {
+        if (*it && (*it)->fbwindow())
+            (*it)->fbwindow()->restore(*it, true);
+    }
+}
+
 /**
  * This function is called whenever we aren't quite sure what
  * focus is meant to be, it'll make things right ;-)