From 7fad5224d47aba47d4fe02d2ce2b20e058bdedc0 Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Sun, 8 Dec 2013 13:51:38 +0000
Subject: If not using sticky mode (the default), clients aren't automagically
 assigned a group, thus cc->group will be NULL - fix the client group shortcut
 in menu lists; crash reported by Christian Neukirchen.

---
 mousefunc.c | 4 ++--
 search.c    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mousefunc.c b/mousefunc.c
index 05cdfe2..f465802 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -231,8 +231,8 @@ mousefunc_menu_unhide(struct client_ctx *cc, void *arg)
 				continue;
 
 			mi = xcalloc(1, sizeof(*mi));
-			(void)snprintf(mi->text, sizeof(mi->text),
-			    "(%d) %s", cc->group->shortcut, wname);
+			(void)snprintf(mi->text, sizeof(mi->text), "(%d) %s",
+			    cc->group ? cc->group->shortcut : 0, wname);
 			mi->ctx = cc;
 			TAILQ_INSERT_TAIL(&menuq, mi, entry);
 		}
diff --git a/search.c b/search.c
index 4d5a7c1..483a51b 100644
--- a/search.c
+++ b/search.c
@@ -143,7 +143,7 @@ search_print_client(struct menu *mi, int list)
 		cc->matchname = cc->name;
 
 	(void)snprintf(mi->print, sizeof(mi->print), "(%d) %c%s",
-	    cc->group->shortcut, flag, cc->matchname);
+	    cc->group ? cc->group->shortcut : 0, flag, cc->matchname);
 
 	if (!list && cc->matchname != cc->name &&
 	    strlen(mi->print) < sizeof(mi->print) - 1) {
-- 
cgit 1.4.1