[vlc-commits] macosx: drop the potential BDMV folder from a bluray path (fixes #10928)

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Tue Mar 18 15:18:37 2014 +0100| [c38dc0da7afba7010fc9671afa459e62ffe2ac2e] | committer: David Fuhrmann

macosx: drop the potential BDMV folder from a bluray path (fixes #10928)

Only the path to the bluray structure itself is supported.

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

 modules/gui/macosx/open.m |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/gui/macosx/open.m b/modules/gui/macosx/open.m
index 9f3cfcd..60e2f03 100644
--- a/modules/gui/macosx/open.m
+++ b/modules/gui/macosx/open.m
@@ -1006,6 +1006,13 @@ out:
     NSImage *o_image = [[NSWorkspace sharedWorkspace] iconForFile: o_path];
     NSString *o_device_path;
 
+    // BDMV path must not end with BDMV directory
+    if([o_type isEqualToString: kVLCMediaBDMVFolder]) {
+        if([[o_path lastPathComponent] isEqualToString: @"BDMV"]) {
+            o_path = [o_path stringByDeletingLastPathComponent];
+        }
+    }
+
     if ([o_type isEqualToString: kVLCMediaVideoTSFolder] ||
         [o_type isEqualToString: kVLCMediaBD] ||
         [o_type isEqualToString: kVLCMediaBDMVFolder] ||