[vlc-commits] macosx: only pause on minimize, if window with video is minimized
David Fuhrmann
git at videolan.org
Thu Mar 15 10:43:50 CET 2012
vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Thu Mar 15 10:35:16 2012 +0100| [be3ffe18f1ab6512a51cd96764177aa2c71f98bf] | committer: David Fuhrmann
macosx: only pause on minimize, if window with video is minimized
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=be3ffe18f1ab6512a51cd96764177aa2c71f98bf
---
modules/gui/macosx/MainWindow.m | 16 +---------------
1 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 299c9be..a5654cc 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -890,14 +890,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)performMiniaturize:(id)sender
{
if (b_dark_interface)
- {
[self miniaturize: sender];
- if (config_GetInt( VLCIntf, "macosx-pause-minimized" ))
- {
- if ([[VLCMain sharedInstance] activeVideoPlayback])
- [[VLCCoreInteraction sharedInstance] pause];
- }
- }
else
[super performMiniaturize: sender];
}
@@ -1043,7 +1036,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
{
if (config_GetInt( VLCIntf, "macosx-pause-minimized" ))
{
- if([notification object] == o_detached_video_window || [notification object] == self)
+ if([notification object] == o_detached_video_window || ([notification object] == self && !b_nonembedded))
{
if([[VLCMain sharedInstance] activeVideoPlayback])
[[VLCCoreInteraction sharedInstance] pause];
@@ -2276,14 +2269,7 @@ static VLCMainWindow *_o_sharedInstance = nil;
- (void)performMiniaturize:(id)sender
{
if (b_dark_interface)
- {
[self miniaturize: sender];
- if (config_GetInt( VLCIntf, "macosx-pause-minimized" ))
- {
- if ([[VLCMain sharedInstance] activeVideoPlayback])
- [[VLCCoreInteraction sharedInstance] pause];
- }
- }
else
[super performMiniaturize: sender];
}
More information about the vlc-commits
mailing list