]> git.sesse.net Git - vlc/commitdiff
macosx: make sure that playbacks stops when closing the main window (fixes #5858)
authorFelix Paul Kühne <fkuehne@videolan.org>
Sun, 15 Jan 2012 19:08:45 +0000 (20:08 +0100)
committerFelix Paul Kühne <fkuehne@videolan.org>
Sun, 15 Jan 2012 19:08:45 +0000 (20:08 +0100)
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindowTitle.m

index 6864ec2fb84afdfefe60425a36d8534051f4a402..4b751b48101b8606ad652cff33a12a4e1e1c0e5f 100644 (file)
@@ -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];
 }
index f20088532f5256b55fbbd4fbb65c96cd349f4c53..effee0927e713095b01b63123cc6656073164523 100644 (file)
 - (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)