Ken Thomases : winemac: Make -setMacDrvParentWindow: do nothing if new parent is same as latent parent.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6873c3ee66dd2d207771d72715d8025a430b31c1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6873c3ee66dd2d207771d72715...

Author: Ken Thomases 
Date:   Fri Aug 30 00:00:46 2013 -0500

winemac: Make -setMacDrvParentWindow: do nothing if new parent is same as latent parent.

---

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

diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index f68a37c..141fc61 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -949,7 +949,8 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)

- (void) setMacDrvParentWindow:(WineWindow*)parent
     {
-        if ([self parentWindow] != parent)
+        WineWindow* oldParent = (WineWindow*)[self parentWindow];
+        if ((oldParent && oldParent != parent) || (!oldParent && latentParentWindow != parent))
         {
             [[self parentWindow] removeChildWindow:self];
             self.latentParentWindow = nil;