save the focus_client when falling back, so we don't actually refocus it when we...

[chaz/openbox] / openbox / screen.c

diff --git a/openbox/screen.c b/openbox/screen.c
index dcb9cd132f33a02c5e7b90f7516a2e9c8bf71fc4..70de299d35acbc0bc879e91b2a7ada6292534644 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -463,7 +463,7 @@ void screen_set_desktop(guint num)
 
     event_ignore_queued_enters();
 
-    focus_hilite = focus_fallback_target(OB_FOCUS_FALLBACK_NOFOCUS);
+    focus_hilite = focus_fallback_target(TRUE, focus_client);
     if (focus_hilite) {
         frame_adjust_focus(focus_hilite->frame, TRUE);
 
@@ -893,7 +893,7 @@ void screen_show_desktop(gboolean show)
                 client_validate(it->data) && client_focus(it->data))
                 break;
     } else {
-        focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
+        focus_fallback(TRUE);
     }
 
     show = !!show; /* make it boolean */