M ChangeLog → ChangeLog

@@ -1,5 +1,8 @@
  (Format: Year/Month/Day)
 Changes for 1.0.0:
+*07/08/20:
+   * Fix some focus issues with moving windows between workspaces (Mark)
+     FocusControl.cc
 *07/08/12:
    * Updated de_* translations, #1767986 ( Thanks Christian Loosli )
 *07/08/11:

M src/FocusControl.cc → src/FocusControl.cc

@@ -421,10 +421,12 @@ void FocusControl::revertFocus(BScreen &screen) {
     if (s_reverting)
         return;
 
-    FocusControl::s_reverting = true;
-
     WinClient *next_focus = 
         screen.focusControl().lastFocusedWindow(screen.currentWorkspaceID());
+
+    if (next_focus && next_focus->fbwindow() &&
+        next_focus->fbwindow()->isStuck())
+        FocusControl::s_reverting = true;
 
     // if setting focus fails, or isn't possible, fallback correctly
     if (!(next_focus && next_focus->focus())) {