From 6ccf70f82d9136844ae8f2bb68b43aa31fd09d25 Mon Sep 17 00:00:00 2001
From: okan
Date: Fri, 22 Aug 2014 19:04:00 +0000
Subject: Fix nogroup regression, where nogroup became an actual group - the
 symantics between cwm groups and ewmh got in the way.  Ensure a client that
 wants to be in nogroup stays in nogroup (thus stays in view), even when
 (re)reading NET_WM_DESKTOP.  Paritially reverts patchset 644 (2014-02-07
 13:09 PST) which deals with a NULL cc->group.  All to be revisited when
 NET_WM_STATE_STICKY hits cwm.

Reported by many; testing and ok phessler.
---
 search.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'search.c')

diff --git a/search.c b/search.c
index 0b3b95d..3ee8e9d 100644
--- a/search.c
+++ b/search.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: search.c,v 1.38 2014/08/20 15:15:29 okan Exp $
+ * $OpenBSD: search.c,v 1.39 2014/08/22 19:04:00 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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->num, flag, cc->matchname);
+	    cc->group ? cc->group->num : 0, flag, cc->matchname);
 
 	if (!list && cc->matchname != cc->name &&
 	    strlen(mi->print) < sizeof(mi->print) - 1) {
-- 
cgit v1.2.3-2-gb3c3