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 @@
 (Format: Year/Month/Day)
 Changes for 0.9.6:
 *03/09/24:
+  * Fix crash when closing active window while cycling focus (Simon)
+    Screen.cc
   * Fix updates to mwm_hints, and make configure request
     move and resize atomic (Simon)
     - 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 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Screen.cc,v 1.233 2003/09/14 10:13:54 fluxgen Exp $
+// $Id: Screen.cc,v 1.234 2003/09/24 14:26:01 rathnor Exp $
 
 
 #include "Screen.hh"
@@ -744,6 +744,9 @@ void BScreen::removeClient(WinClient &client) {
             Fluxbox::instance()->revertFocus(focused->screen());
     }
 
+    if (cycling_last == &client)
+        cycling_last = 0;
+
     for_each(getWorkspacesList().begin(), getWorkspacesList().end(),
              mem_fun(&Workspace::updateClientmenu));