From 315961faeceefae30d3fcce28c3171fdec7e5c5d Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Thu, 9 Apr 2020 13:53:50 +0000
Subject: Some more, and use of wp->window before wp NULL check in format.c.

---
 cmd-switch-client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cmd-switch-client.c')

diff --git a/cmd-switch-client.c b/cmd-switch-client.c
index 61677761..cf84c319 100644
--- a/cmd-switch-client.c
+++ b/cmd-switch-client.c
@@ -73,7 +73,6 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item)
 		return (CMD_RETURN_ERROR);
 	s = item->target.s;
 	wl = item->target.wl;
-	w = wl->window;
 	wp = item->target.wp;
 
 	if (args_has(args, 'r'))
@@ -115,6 +114,7 @@ cmd_switch_client_exec(struct cmd *self, struct cmdq_item *item)
 		if (item->client == NULL)
 			return (CMD_RETURN_NORMAL);
 		if (wl != NULL && wp != NULL) {
+			w = wl->window;
 			if (window_push_zoom(w, args_has(self->args, 'Z')))
 				server_redraw_window(w);
 			window_redraw_active_switch(w, wp);
-- 
cgit