From 47cab12c79888734f79ac0f19e11b2ea7ba712ad Mon Sep 17 00:00:00 2001
From: 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'mousefunc.c')

diff --git a/mousefunc.c b/mousefunc.c
index c634333..7c82f42 100644
--- a/mousefunc.c
+++ b/mousefunc.c
@@ -16,7 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: mousefunc.c,v 1.60 2013/12/02 19:30:27 okan Exp $
+ * $OpenBSD: mousefunc.c,v 1.61 2013/12/08 13:51:38 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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);
 		}
-- 
cgit v1.2.3-2-gb3c3