vlc | branch: master | David Fuhrmann <[email protected]> | Mon Jul 23 10:08:18 2012 +0200| [304a1c0a392212ef3cdc44481c190518956e6d27] | committer: David Fuhrmann
macosx vout: don't reset window state on close here > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=304a1c0a392212ef3cdc44481c190518956e6d27 --- 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 db5399c..4bbb801 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -1807,6 +1807,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 ccc3823..10557a7 100644 --- a/modules/video_output/macosx.m +++ b/modules/video_output/macosx.m @@ -268,9 +268,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"); _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
