mirror of
https://github.com/leahneukirchen/cwm.git
synced 2023-08-10 21:13:12 +03:00
Ensure we don't action on the last group when the requested one is not found.
This commit is contained in:
parent
8cd6d1154c
commit
880b5cda3f
14
group.c
14
group.c
@ -160,15 +160,14 @@ group_movetogroup(struct client_ctx *cc, int idx)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
TAILQ_FOREACH(gc, &sc->groupq, entry) {
|
TAILQ_FOREACH(gc, &sc->groupq, entry) {
|
||||||
if (gc->num == idx)
|
if (gc->num == idx) {
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (cc->gc == gc)
|
if (cc->gc == gc)
|
||||||
return;
|
return;
|
||||||
if (gc->num != 0 && group_holds_only_hidden(gc))
|
if (gc->num != 0 && group_holds_only_hidden(gc))
|
||||||
client_hide(cc);
|
client_hide(cc);
|
||||||
group_assign(gc, cc);
|
group_assign(gc, cc);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
@ -221,10 +220,7 @@ group_hidetoggle(struct screen_ctx *sc, int idx)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
TAILQ_FOREACH(gc, &sc->groupq, entry) {
|
TAILQ_FOREACH(gc, &sc->groupq, entry) {
|
||||||
if (gc->num == idx)
|
if (gc->num == idx) {
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (group_holds_only_hidden(gc))
|
if (group_holds_only_hidden(gc))
|
||||||
group_show(gc);
|
group_show(gc);
|
||||||
else {
|
else {
|
||||||
@ -233,6 +229,8 @@ group_hidetoggle(struct screen_ctx *sc, int idx)
|
|||||||
if (TAILQ_EMPTY(&gc->clientq))
|
if (TAILQ_EMPTY(&gc->clientq))
|
||||||
group_setactive(gc);
|
group_setactive(gc);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
Loading…
Reference in New Issue
Block a user