vlc | branch: master | Felix Paul Kühne <fkue...@videolan.org> | Sun Jan 15 20:08:45 2012 +0100| [ad4ff46f2b04d96eb4b4dfab5a39d6d1dc25025c] | committer: Felix Paul Kühne
macosx: make sure that playbacks stops when closing the main window (fixes #5858) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ad4ff46f2b04d96eb4b4dfab5a39d6d1dc25025c --- modules/gui/macosx/MainWindow.m | 6 ++++++ modules/gui/macosx/MainWindowTitle.m | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m index 6864ec2..4b751b4 100644 --- a/modules/gui/macosx/MainWindow.m +++ b/modules/gui/macosx/MainWindow.m @@ -752,7 +752,10 @@ static VLCMainWindow *_o_sharedInstance = nil; - (void)performClose:(id)sender { if (b_dark_interface) + { [self orderOut: sender]; + [[VLCCoreInteraction sharedInstance] stop]; + } else [super performClose: sender]; } @@ -760,7 +763,10 @@ static VLCMainWindow *_o_sharedInstance = nil; - (void)performMiniaturize:(id)sender { if (b_dark_interface) + { [self miniaturize: sender]; + [[VLCCoreInteraction sharedInstance] pause]; + } else [super performMiniaturize: sender]; } diff --git a/modules/gui/macosx/MainWindowTitle.m b/modules/gui/macosx/MainWindowTitle.m index f200885..effee09 100644 --- a/modules/gui/macosx/MainWindowTitle.m +++ b/modules/gui/macosx/MainWindowTitle.m @@ -158,7 +158,7 @@ - (IBAction)buttonAction:(id)sender { if (sender == o_red_btn) - [[self window] orderOut: sender]; + [[self window] performClose: sender]; else if (sender == o_yellow_btn) [[self window] miniaturize: sender]; else if (sender == o_green_btn) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits