aboutsummaryrefslogtreecommitdiffstats
path: root/search.c
diff options
context:
space:
mode:
authorokan2014-08-22 19:04:00 +0000
committerokan2014-08-22 19:04:00 +0000
commit6ccf70f82d9136844ae8f2bb68b43aa31fd09d25 (patch)
tree8878aa1922fb569bda10ffeb3f371f269ada0d14 /search.c
parentbaef75bfc55b19ae2f4f1a5f09c82d35539d5637 (diff)
downloadcwm-6ccf70f82d9136844ae8f2bb68b43aa31fd09d25.tar.gz
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.
Diffstat (limited to 'search.c')
-rw-r--r--search.c4
1 files changed, 2 insertions, 2 deletions
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) {