From: David Fuhrmann <david.fuhrmann@googlemail.com>
Date: Wed, 12 Jun 2013 16:43:11 +0000 (+0200)
Subject: macosx: fix resize to old size when finishing from fullscreen mode
X-Git-Tag: 2.1.0-git~129
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f664fa80bc043fc6d73021710d26c28be7344f18;p=vlc

macosx: fix resize to old size when finishing from fullscreen mode
---

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 63b7bb8eaf..e96b6adc83 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -745,7 +745,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
         if (!b_fullscreen)
             frameBeforePlayback = [self frame];
     } else {
-        if (!b_nonembedded && !b_fullscreen && frameBeforePlayback.size.width > 0 && frameBeforePlayback.size.height > 0)
+        if (!b_nonembedded && (!b_nativeFullscreenMode || (b_nativeFullscreenMode && !b_fullscreen)) && frameBeforePlayback.size.width > 0 && frameBeforePlayback.size.height > 0)
             [[self animator] setFrame:frameBeforePlayback display:YES];
 
         // update fs button to reflect state for next startup