diff options
author | Okan Demirmen <okan@cvs.openbsd.org> | 2008-03-22 21:34:08 +0000 |
---|---|---|
committer | Okan Demirmen <okan@cvs.openbsd.org> | 2008-03-22 21:34:08 +0000 |
commit | 0f9e6db73fe4522b0314d9cc3ee39591cc0e7cb9 (patch) | |
tree | 0ea9e8c4f34bd186c29bec5a35f18dea8c8c7035 /app/cwm | |
parent | b78e9929dcbc599f72faf75e342153a8e4fc834c (diff) |
allow autogrouping and sticky mode to work together
ok oga@
Diffstat (limited to 'app/cwm')
-rw-r--r-- | app/cwm/group.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/cwm/group.c b/app/cwm/group.c index 3a5db32a6..26363eddf 100644 --- a/app/cwm/group.c +++ b/app/cwm/group.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. * - * $Id: group.c,v 1.6 2008/03/22 15:09:45 oga Exp $ + * $Id: group.c,v 1.7 2008/03/22 21:34:07 okan Exp $ */ #include "headers.h" @@ -341,11 +341,6 @@ group_autogroup(struct client_ctx *cc) struct group_ctx *gc; 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) return; @@ -358,8 +353,13 @@ group_autogroup(struct client_ctx *cc) } 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); + return; + } } + if (Conf.flags & CONF_STICKY_GROUPS) + _group_add(Group_active, cc); + } |