summaryrefslogtreecommitdiff
path: root/openbox/client_list_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'openbox/client_list_menu.c')
-rw-r--r--openbox/client_list_menu.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index 2e87259b..c49e63e9 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -101,10 +101,12 @@ static void desk_menu_execute(ObMenuEntry *self, ObMenuFrame *f,
{
ObClient *t = self->data.normal.data;
if (t) { /* it's set to NULL if its destroyed */
- client_activate(t, TRUE, FALSE, TRUE, TRUE, TRUE);
+ gboolean here = state & ShiftMask;
+
+ client_activate(t, TRUE, here, TRUE, TRUE, TRUE);
/* if the window is omnipresent then we need to go to its
desktop */
- if (t->desktop == DESKTOP_ALL)
+ if (!here && t->desktop == DESKTOP_ALL)
screen_set_desktop(self->id, FALSE);
}
else