M ChangeLog → 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

M src/Screen.cc → src/Screen.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // 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"
@@ -743,6 +743,9 @@ client.transientFor()->fbwindow()->setInputFocus();
         else
             Fluxbox::instance()->revertFocus(focused->screen());
     }
+
+    if (cycling_last == &client)
+        cycling_last = 0;
 
     for_each(getWorkspacesList().begin(), getWorkspacesList().end(),
              mem_fun(&Workspace::updateClientmenu));