[vlc-commits] macosx vout: don't reset window state on close here

[David Fuhrmann]

vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Mon Jul 23 10:08:18 2012 +0200| [4bb0ca5857744c75a8f95016f0902051ff69d618] | committer: Felix Paul Kühne

macosx vout: don't reset window state on close here
(cherry picked from commit 304a1c0a392212ef3cdc44481c190518956e6d27)

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=4bb0ca5857744c75a8f95016f0902051ff69d618
---

 modules/gui/macosx/MainWindow.m |    3 +++
 modules/video_output/macosx.m   |    3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 6e7e36f..4e508b0 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -1603,6 +1603,9 @@ static VLCMainWindow *_o_sharedInstance = nil;
         [self makeFirstResponder: nil];
         [o_detached_video_window orderOut: nil];
 
+        if( [self level] != NSNormalWindowLevel )
+            [self setLevel: NSNormalWindowLevel];
+
         // restore alpha value to 1 for the case that macosx-opaqueness is set to < 1
         [self setAlphaValue:1.0];
     }
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 0f81da7..c2af136 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -257,9 +257,6 @@ void Close (vlc_object_t *this)
     vout_display_t *vd = (vout_display_t *)this;
     vout_display_sys_t *sys = vd->sys;
 
-    if ([[sys->glView window] level] != NSNormalWindowLevel)
-        [[sys->glView window] setLevel: NSNormalWindowLevel];
-
     [sys->glView setVoutDisplay:nil];
 
     var_Destroy (vd, "drawable-nsobject");