From 057da64de713d63e4e6f929c0e2fd4596fe41bde Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Sat, 18 Sep 1999 22:38:17 +0000
Subject: [PATCH] fixed crash on restart

---
 src/window.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/window.c b/src/window.c
index 356771b8..f9c4f0aa 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2215,7 +2215,8 @@ wWindowSaveState(WWindow *wwin)
     data[3] = wwin->flags.hidden;
 
     for (i = 0; i < MAX_WINDOW_SHORTCUTS; i++) {
-	if (WMCountInBag(wwin->screen_ptr->shortcutWindows[i], wwin))
+	if (wwin->screen_ptr->shortcutWindows[i] &&
+	    WMCountInBag(wwin->screen_ptr->shortcutWindows[i], wwin))
 	    data[9] |= 1<<i;
     }
     XChangeProperty(dpy, wwin->client_win, _XA_WINDOWMAKER_STATE,