From c8e8acff6e2d7a46173c16d8dc00d7127b385528 Mon Sep 17 00:00:00 2001 From: David Hill Date: Fri, 20 Jul 2012 12:57:50 -0400 Subject: [PATCH] check replies separately --- spectrwm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spectrwm.c b/spectrwm.c index 1751412..5f25088 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -820,7 +820,9 @@ teardown_ewmh(void) pc = xcb_get_property(conn, 0, screens[i].root, sup_check, XCB_ATOM_WINDOW, 0, 1); pr = xcb_get_property_reply(conn, pc, NULL); - if (pr && pr->format == sup_check) { + if (!pr) + continue; + if (pr->format == sup_check) { id = *((xcb_window_t *)xcb_get_property_value(pr)); xcb_destroy_window(conn, id); @@ -6422,7 +6424,9 @@ get_ws_idx(xcb_window_t id) xcb_get_property(conn, 0, id, a_swm_ws, XCB_ATOM_STRING, 0, SWM_PROPLEN), NULL); - if (gpr && gpr->type) { + if (!gpr) + return (-1); + if (gpr->type) { proplen = xcb_get_property_value_length(gpr); if (proplen > 0) { prop = malloc(proplen + 1); -- 1.7.10.4