when restoring from show-desktop mode because a window is going to be focused, then...

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index a302828baf1a7a293d87dc995e6efce2cbb687a5..8fdbe096f6b577c6035d116b27411a24622e6ab5 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -860,7 +860,7 @@ void screen_update_desktop_names()
     }
 }
 
-void screen_show_desktop(gboolean show)
+void screen_show_desktop(gboolean show, gboolean restore_focus)
 {
     GList *it;
      
@@ -895,7 +895,7 @@ void screen_show_desktop(gboolean show)
                 client_focus(it->data))
                 break;
         }
-    } else {
+    } else if (restore_focus) {
         ObClient *c;
 
         /* use NULL for the "old" argument because the desktop was focused