[vlc-commits] macosx: fixed trivial merge mistake when broke 'advanced open file'

Felix Paul Kühne git at videolan.org
Thu Jun 23 23:26:30 CEST 2011


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Jun 23 23:26:21 2011 +0200| [17a1e221796b030ec2aaa5c8cafd1947b5008255] | committer: Felix Paul Kühne

macosx: fixed trivial merge mistake when broke 'advanced open file'

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

 modules/gui/macosx/open.m |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index 06bd7f6..62e52bf 100644
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -630,7 +630,8 @@ static VLCOpen *_o_sharedMainInstance = nil;
 
         [self setMRL: o_mrl_string];
     }
-    [self setMRL: @""];
+    else
+        [self setMRL: @""];
 }
 
 - (IBAction)openFileBrowse:(id)sender



More information about the vlc-commits mailing list