user32: Do not change focus if the window is no longer active.

5dfcadd7 · Dmitry Timoshkov · Alexandre Julliard · 16920c1d · 5dfcadd7
Commit 5dfcadd7 authored Nov 19, 2008 by Dmitry Timoshkov Committed by Alexandre Julliard Nov 19, 2008
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

focus.c dlls/user32/focus.c +3 -0

No files found.
--- a/dlls/user32/focus.c
+++ b/dlls/user32/focus.c
@@ -276,6 +276,9 @@ HWND WINAPI SetFocus( HWND hwnd )
        {
            if (!set_active_window( hwndTop, NULL, FALSE, FALSE )) return 0;
            if (!IsWindow( hwnd )) return 0;  /* Abort if window destroyed */
+
+            /* Do not change focus if the window is no longer active */
+            if (hwndTop != GetActiveWindow()) return 0;
        }
    }
    else /* NULL hwnd passed in */