--- src/startup.c.orig	Tue Aug 11 20:41:14 2015
+++ src/startup.c	Wed Jun  8 09:52:32 2016
@@ -666,7 +666,7 @@ void StartUp(Bool defaultScreenOnly)
 		wMenuRestoreState(wScreen[j]);
 
 		/* If we're not restarting, restore session */
-		if (wPreferences.flags.restarting == 0 && !wPreferences.flags.norestore)
+		if (!wPreferences.flags.restarting && !wPreferences.flags.norestore)
 			wSessionRestoreState(wScreen[j]);
 
 		if (!wPreferences.flags.noautolaunch) {