Commit 87459ff8 authored by Alexander Larsson's avatar Alexander Larsson
Browse files

Don't move global user time backwards

When setting the user_time on a specific app to something, make sure
we're not moving the global per-display user time backwards.
parent bb093cf4
......@@ -3995,7 +3995,9 @@ gdk_x11_window_set_user_time (GdkWindow *window,
XA_CARDINAL, 32, PropModeReplace,
(guchar *)&timestamp_long, 1);
if (timestamp_long != GDK_CURRENT_TIME)
if (timestamp_long != GDK_CURRENT_TIME &&
(display_x11->user_time == GDK_CURRENT_TIME ||
XSERVER_TIME_IS_LATER (timestamp_long, display_x11->user_time)))
display_x11->user_time = timestamp_long;
if (toplevel)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment