summary refs log tree commit diff
path: root/screen.c
diff options
context:
space:
mode:
authorokan <okan>2014-02-02 21:34:05 +0000
committerokan <okan>2014-02-02 21:34:05 +0000
commitb923524a8e637141c0c832f6c8989ee600b67946 (patch)
treeb320db4f8e1b54cda2d7781fa617a6aaa27a9839 /screen.c
parentc7d4add2f27b74f62be3dd973bca402eb89ee5cb (diff)
parentad76995af7e1bbae8ec81dd917def917453c379b (diff)
downloadcwm-b923524a8e637141c0c832f6c8989ee600b67946.tar.gz
cwm-b923524a8e637141c0c832f6c8989ee600b67946.tar.xz
cwm-b923524a8e637141c0c832f6c8989ee600b67946.zip
cvsimport
Diffstat (limited to 'screen.c')
-rw-r--r--screen.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/screen.c b/screen.c
index 910f353..55e0430 100644
--- a/screen.c
+++ b/screen.c
@@ -44,8 +44,6 @@ screen_init(int which)
 	TAILQ_INIT(&sc->mruq);
 
 	sc->which = which;
-	sc->visual = DefaultVisual(X_Dpy, sc->which);
-	sc->colormap = DefaultColormap(X_Dpy, sc->which);
 	sc->rootwin = RootWindow(X_Dpy, sc->which);
 	conf_screen(sc);
 
@@ -65,7 +63,6 @@ screen_init(int which)
 
 	/* Deal with existing clients. */
 	XQueryTree(X_Dpy, sc->rootwin, &w0, &w1, &wins, &nwins);
-
 	for (i = 0; i < nwins; i++) {
 		XGetWindowAttributes(X_Dpy, wins[i], &winattr);
 		if (winattr.override_redirect ||
@@ -73,7 +70,8 @@ screen_init(int which)
 			continue;
 		(void)client_init(wins[i], sc, winattr.map_state != IsUnmapped);
 	}
-	XFree(wins);
+	if (wins)
+		XFree(wins);
 
 	screen_updatestackingorder(sc);