vlc/vlc-2.2 | branch: master | David Fuhrmann <[email protected]> | Sun Feb 15 14:03:56 2015 +0100| [93be09b6150ce01bf102c505755df130b0497db1] | committer: David Fuhrmann
macosx: Do not force-pause playback when resume dialog is shown (cherry picked from commit 3e46bbc954cf644721ec8028a76056ddb3baa2f6) Signed-off-by: David Fuhrmann <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=93be09b6150ce01bf102c505755df130b0497db1 --- modules/gui/macosx/playlist.m | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index 64f8a77..a59298b 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -1572,10 +1572,8 @@ [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSModalPanelRunLoopMode]; - [[VLCCoreInteraction sharedInstance] pause]; returnValue = [theAlert runModal]; [timer invalidate]; - [[VLCCoreInteraction sharedInstance] playOrPause]; // restart button was pressed or timeout happened if (returnValue == NSAlertAlternateReturn || _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
