Cope with loading a film containing a missing DCP which itself contains subtitles.

[dcpomatic.git] / src / lib / cross_common.cc

diff --git a/src/lib/cross_common.cc b/src/lib/cross_common.cc
index d313445da906bbf3786d2130674cb3f826549720..b4d322096a5645f3bf7f7fd5c09d40f94279b3ef 100644 (file)
--- a/src/lib/cross_common.cc
+++ b/src/lib/cross_common.cc
@@ -156,7 +156,7 @@ analyse_osx_media_path (string path)
 }
 
 
-/* Take soem OSXDisk objects, representing disks that `DARegisterDiskAppearedCallback` told us about,
+/* Take some OSXDisk objects, representing disks that `DARegisterDiskAppearedCallback` told us about,
  * and find those drives that we could write a DCP to.  The drives returned are "real" (not synthesized)
  * and are whole disks (not partitions).  They may be mounted, or contain mounted partitions, in which
  * their mounted() method will return true.
@@ -172,7 +172,7 @@ osx_disks_to_drives (vector<OSXDisk> disks)
                        continue;
                }
                for (auto& j: disks) {
-                       if (!j.mount_points.empty() && starts_with(j.device, i.device)) {
+                       if (&i != &j && !j.mount_points.empty() && starts_with(j.device, i.device)) {
                                LOG_DISK("Marking %1 as mounted because %2 is", i.device, j.device);
                                std::copy(j.mount_points.begin(), j.mount_points.end(), back_inserter(i.mount_points));
                        }