Ensure we don't action on the last group when the requested one is not found.
This commit is contained in:
14
group.c
14
group.c
@@ -160,16 +160,15 @@ group_movetogroup(struct client_ctx *cc, int idx)
|
||||
return;
|
||||
|
||||
TAILQ_FOREACH(gc, &sc->groupq, entry) {
|
||||
if (gc->num == idx)
|
||||
break;
|
||||
}
|
||||
|
||||
if (gc->num == idx) {
|
||||
if (cc->gc == gc)
|
||||
return;
|
||||
if (gc->num != 0 && group_holds_only_hidden(gc))
|
||||
client_hide(cc);
|
||||
group_assign(gc, cc);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
group_toggle_membership(struct client_ctx *cc)
|
||||
@@ -221,10 +220,7 @@ group_hidetoggle(struct screen_ctx *sc, int idx)
|
||||
return;
|
||||
|
||||
TAILQ_FOREACH(gc, &sc->groupq, entry) {
|
||||
if (gc->num == idx)
|
||||
break;
|
||||
}
|
||||
|
||||
if (gc->num == idx) {
|
||||
if (group_holds_only_hidden(gc))
|
||||
group_show(gc);
|
||||
else {
|
||||
@@ -234,6 +230,8 @@ group_hidetoggle(struct screen_ctx *sc, int idx)
|
||||
group_setactive(gc);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
group_only(struct screen_ctx *sc, int idx)
|
||||
|
||||
Reference in New Issue
Block a user