From: Carl Hetherington <cth@carlh.net>
Date: Thu, 30 Apr 2020 14:55:46 +0000 (+0200)
Subject: Add some more macOS debug logging for disks, and ignore mounted disk images.
X-Git-Tag: v2.15.68~2
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=4f79cf7c21eb11676d7c75f861f6da37a396ac51;p=dcpomatic.git

Add some more macOS debug logging for disks, and ignore mounted disk images.
---

diff --git a/src/lib/cross_osx.cc b/src/lib/cross_osx.cc
index 3b08c9684..a15ad0322 100644
--- a/src/lib/cross_osx.cc
+++ b/src/lib/cross_osx.cc
@@ -298,10 +298,19 @@ analyse_media_path (CFDictionaryRef& description)
 
 	void const* str = CFDictionaryGetValue (description, kDADiskDescriptionMediaPathKey);
 	if (!str) {
+		LOG_DISK_NC("There is no MediaPathKey");
 		return optional<MediaPath>();
 	}
 
 	string path(CFStringGetCStringPtr((CFStringRef) str, kCFStringEncodingUTF8));
+	LOG_DISK("MediaPathKey is %1", path);
+
+	if (path.find("/IOHDIXController") != string::npos) {
+		/* This is a disk image, so we completely ignore it */
+		LOG_DISK_NC("Ignoring this as it seems to be a disk image");
+		return optional<MediaPath>();
+	}
+
 	MediaPath mp;
 	if (starts_with(path, "IODeviceTree:")) {
 		mp.real = true;