X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=db7c8ace460222ff7abafa4c2d8abc4472ef6a43;hb=c8983c42a7c27321d18825f2a130c15e29046f7b;hp=71748d65277701dc383711c89733aeb683b66f42;hpb=ad852b6b56e43bdd7dda1389f54051cf92c0fad9;p=chaz%2Fopenbox

diff --git a/openbox/screen.c b/openbox/screen.c
index 71748d65..db7c8ace 100644
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -58,6 +58,7 @@ gboolean screen_showing_desktop;
 DesktopLayout screen_desktop_layout;
 gchar  **screen_desktop_names;
 Window   screen_support_win;
+Time     screen_desktop_user_time = CurrentTime;
 
 static Rect  **area; /* array of desktop holding array of xinerama areas */
 static Rect  *monitor_area;
@@ -138,8 +139,7 @@ static gboolean replace_wm()
       }
 
       if (wait >= timeout) {
-          g_message(_("Timeout expired while waiting for the current WM to die"
-                      " on screen %d"), ob_screen);
+          g_message(_("The WM on screen %d is not exiting"), ob_screen);
           return FALSE;
       }
     }
@@ -475,6 +475,9 @@ void screen_set_desktop(guint num)
     }
 
     event_ignore_queued_enters();
+
+    if (event_curtime != CurrentTime)
+        screen_desktop_user_time = event_curtime;
 }
 
 static void get_row_col(guint d, guint *r, guint *c)