Ken Thomases : winemac: For WINDOW_DID_UNMINIMIZE events, don' t attempt to restore windows which aren't minimized and visible.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 94cfa7799bac562a82ef9f403be93fce73519520
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=94cfa7799bac562a82ef9f403b...

Author: Ken Thomases <ken(a)codeweavers.com>
Date:   Tue Dec 31 01:05:15 2013 -0600

winemac: For WINDOW_DID_UNMINIMIZE events, don't attempt to restore windows which aren't minimized and visible.

The Win32 window state might have changed while the event was in the queue,
making it obsolete.  Sending WM_SYSCOMMAND/SC_RESTORE might re-show a hidden
window, for example.

---

 dlls/winemac.drv/window.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c
index fd47ea2..5a1d5a7 100644
--- a/dlls/winemac.drv/window.c
+++ b/dlls/winemac.drv/window.c
@@ -2095,7 +2095,7 @@ void macdrv_window_did_unminimize(HWND hwnd)
     style = GetWindowLongW(hwnd, GWL_STYLE);
 
     data->minimized = FALSE;
-    if (style & (WS_MINIMIZE | WS_MAXIMIZE))
+    if ((style & (WS_MINIMIZE | WS_VISIBLE)) == (WS_MINIMIZE | WS_VISIBLE))
     {
         TRACE("restoring win %p/%p\n", hwnd, data->cocoa_window);
         release_win_data(data);