Ken Thomases : winemac: Don' t unminimize a window on first activation during start-up.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4c651e39e4721166ef4024380ad09e8ecd4ad754
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4c651e39e4721166ef4024380a...

Author: Ken Thomases 
Date:   Tue Jun  4 04:59:37 2013 -0500

winemac: Don't unminimize a window on first activation during start-up.

---

dlls/winemac.drv/cocoa_app.h |    2 ++
 dlls/winemac.drv/cocoa_app.m |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h
index 681ef52..1338137 100644
--- a/dlls/winemac.drv/cocoa_app.h
+++ b/dlls/winemac.drv/cocoa_app.h
@@ -81,6 +81,8 @@ enum {
     NSTimeInterval lastEventTapEventTime;

NSImage* applicationIcon;
+
+    BOOL beenActive;
 }

@property (nonatomic) CGEventSourceKeyboardType keyboardType;
diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m
index 4a54f66..9984114 100644
--- a/dlls/winemac.drv/cocoa_app.m
+++ b/dlls/winemac.drv/cocoa_app.m
@@ -1707,7 +1707,7 @@ int macdrv_err_on;

[self adjustWindowLevels:YES];

-        if (![self frontWineWindow])
+        if (beenActive && ![self frontWineWindow])
         {
             for (WineWindow* window in [NSApp windows])
             {
@@ -1718,6 +1718,7 @@ int macdrv_err_on;
                 }
             }
         }
+        beenActive = TRUE;

// If a Wine process terminates abruptly while it has the display captured
         // and switched to a different resolution, Mac OS X will uncapture the