summaryrefslogtreecommitdiff
path: root/src/window.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/window.c')
-rw-r--r--src/window.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/window.c b/src/window.c
index ccc2a553..3b6a089d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1624,20 +1624,20 @@ window_takes_focus_on_map (MetaWindow *window)
compare = window->initial_timestamp_set ? window->initial_timestamp : 0;
compare = window->net_wm_user_time_set ? window->net_wm_user_time : compare;
- if ((window->display->focus_window == NULL) ||
- XSERVER_TIME_IS_BEFORE (window->display->focus_window->net_wm_user_time, compare))
+ if ((window->display->focus_window != NULL) &&
+ XSERVER_TIME_IS_BEFORE (compare, window->display->focus_window->net_wm_user_time))
{
meta_topic (META_DEBUG_STARTUP,
- "new window %s with no intervening events\n",
- window->desc);
- return TRUE;
+ "window %s focus prevented by other activity; %lu is before %lu\n",
+ window->desc, compare, window->display->focus_window->net_wm_user_time);
+ return FALSE;
}
else
{
meta_topic (META_DEBUG_STARTUP,
- "window %s focus prevented by other activity; %lu is before %lu\n",
- window->desc, compare, window->display->focus_window->net_wm_user_time);
- return FALSE;
+ "new window %s with no intervening events\n",
+ window->desc);
+ return TRUE;
}
break;