From df75c86ef04f5eba8ad8ecbaccea924dfd0c352c Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 13 Nov 2003 06:10:33 +0000 Subject: [PATCH] Fixed a bug that made the crash panel to be shown again and again when the 'Restart Window Maker' option was selected, under some circumstances. (bug reported by Roberto Sanchez ) --- ChangeLog | 2 ++ src/menu.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index f2c2d05e..89567681 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,8 @@ Changes since version 0.80.2: - Fixed synchronization problem between hair cursor and mouse cursor in wmagnify with mouse cursor at the screen edge (Jon Diercks ) - Fixed 2 focus switching related bugs (Allan Peramaki ) +- Fixed a bug that made the crash panel to be shown again and again when the + 'Restart Window Maker' option was selected, under some circumstances. Changes since version 0.80.1: diff --git a/src/menu.c b/src/menu.c index 025f60a7..8edb573a 100644 --- a/src/menu.c +++ b/src/menu.c @@ -2750,6 +2750,10 @@ wMenuRestoreState(WScreen *scr) { WMPropList *menus, *menu, *key, *skey; + if (!scr->session_state) { + return; + } + key = WMCreatePLString("Menus"); menus = WMGetFromPLDictionary(scr->session_state, key); WMReleasePropList(key);