summaryrefslogtreecommitdiff
path: root/openbox/client.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2010-03-29 20:36:35 -0400
committerDana Jansens <danakj@orodu.net>2010-03-29 20:37:20 -0400
commitd826971d7206b3ecc99e9eabf64625303825952a (patch)
tree6bfdf1827bf2b321cb7f8c549fdec46df50d6a6b /openbox/client.c
parente7d5ef84180ea9dc51427ba5f3524f67b6506a67 (diff)
if a launch time isnt there (like for client_activate) assume the window launched before the last desktop switch, not after. ie don't change desktops if you're not sure.
Diffstat (limited to 'openbox/client.c')
-rw-r--r--openbox/client.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/openbox/client.c b/openbox/client.c
index 3e10a9ab..adbbc13b 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -725,8 +725,9 @@ static gboolean client_can_steal_focus(ObClient *self, Time steal_time,
if (!(self->desktop == screen_desktop ||
self->desktop == DESKTOP_ALL) &&
/* the timestamp is from before you changed desktops */
- launch_time && screen_desktop_user_time &&
- !event_time_after(launch_time, screen_desktop_user_time))
+ (!launch_time ||
+ (screen_desktop_user_time &&
+ !event_time_after(launch_time, screen_desktop_user_time))))
{
steal = FALSE;
ob_debug_type(OB_DEBUG_FOCUS,