[vlc-commits] macosx: Open panel: Only trigger MRL update if disc section is active

David Fuhrmann git at videolan.org
Fri Feb 3 10:52:24 CET 2017


vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Thu Feb  2 21:21:52 2017 +0100| [547c2198b480da718182cd79d4d5e8080d1dba14] | committer: David Fuhrmann

macosx: Open panel: Only trigger MRL update if disc section is active

As disc scanning is asyncronous, MRL might be updated with disc
MRL when not desired.

refs #17715

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=547c2198b480da718182cd79d4d5e8080d1dba14
---

 modules/gui/macosx/VLCOpenWindowController.m | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/gui/macosx/VLCOpenWindowController.m b/modules/gui/macosx/VLCOpenWindowController.m
index 79eb5a7..8ffafb3 100644
--- a/modules/gui/macosx/VLCOpenWindowController.m
+++ b/modules/gui/macosx/VLCOpenWindowController.m
@@ -911,7 +911,9 @@ static NSString *kCaptureTabViewId  = @"capture";
         if (selection && [selection boolValue])
             [_discSelectorPopup selectItemAtIndex: [[_discSelectorPopup itemArray] count] - 1];
 
-        [self discSelectorChanged:nil];
+        // only trigger MRL update if the tab view is active
+        if ([[[_tabView selectedTabViewItem] identifier] isEqualToString:kDiscTabViewId])
+            [self discSelectorChanged:nil];
     } else {
         msg_Dbg(getIntf(), "no optical media found");
         [_discSelectorPopup setHidden: YES];



More information about the vlc-commits mailing list