diff options
| author | okan | 2014-08-22 19:04:00 +0000 |
|---|---|---|
| committer | okan | 2014-08-22 19:04:00 +0000 |
| commit | 6ccf70f82d9136844ae8f2bb68b43aa31fd09d25 (patch) | |
| tree | 8878aa1922fb569bda10ffeb3f371f269ada0d14 /mousefunc.c | |
| parent | baef75bfc55b19ae2f4f1a5f09c82d35539d5637 (diff) | |
| download | cwm-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 'mousefunc.c')
| -rw-r--r-- | mousefunc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mousefunc.c b/mousefunc.c index c954991..323ae29 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.72 2014/08/20 15:15:29 okan Exp $ + * $OpenBSD: mousefunc.c,v 1.73 2014/08/22 19:04:00 okan Exp $ */ #include <sys/param.h> @@ -202,7 +202,8 @@ mousefunc_menu_unhide(struct client_ctx *cc, union arg *arg) if (wname == NULL) continue; - menuq_add(&menuq, cc, "(%d) %s", cc->group->num, wname); + menuq_add(&menuq, cc, "(%d) %s", + cc->group ? cc->group->num : 0, wname); } if (TAILQ_EMPTY(&menuq)) |