allow autogrouping and sticky mode to work together

ok oga@
This commit is contained in:
okan 2008-03-22 21:34:07 +00:00
parent 36c1aac90f
commit 38ff7a904e

12
group.c
View File

@ -341,11 +341,6 @@ group_autogroup(struct client_ctx *cc)
struct group_ctx *gc; struct group_ctx *gc;
char group[CALMWM_MAXNAMELEN]; char group[CALMWM_MAXNAMELEN];
if (Conf.flags & CONF_STICKY_GROUPS) {
_group_add(Group_active, cc);
return;
}
if (cc->app_class == NULL || cc->app_name == NULL) if (cc->app_class == NULL || cc->app_name == NULL)
return; return;
@ -358,8 +353,13 @@ group_autogroup(struct client_ctx *cc)
} }
TAILQ_FOREACH(gc, &Groupq, entry) { TAILQ_FOREACH(gc, &Groupq, entry) {
if (strcmp(shortcut_to_name[gc->shortcut], group) == 0) if (strcmp(shortcut_to_name[gc->shortcut], group) == 0) {
_group_add(gc, cc); _group_add(gc, cc);
return;
}
} }
if (Conf.flags & CONF_STICKY_GROUPS)
_group_add(Group_active, cc);
} }