RemovableManager on OSX: Testing for dictionary values for nullness.

Hopefully it fixes Can not start slicer on mac Bigsur #5719
This commit is contained in:
Vojtech Bubnik 2021-04-15 13:48:20 +02:00
parent 0625788583
commit d5ddf8b00e

View File

@ -80,7 +80,9 @@ static void unmount_callback(DADiskRef disk, DADissenterRef dissenter, void *con
NSLog(@"-%@",(CFStringRef)deviceModelKey); NSLog(@"-%@",(CFStringRef)deviceModelKey);
*/ */
if (mediaEjectableKey != nullptr) { if (mediaEjectableKey != nullptr) {
BOOL op = ejectable && (CFEqual(deviceProtocolName, CFSTR("USB")) || CFEqual(deviceModelKey, CFSTR("SD Card Reader")) || CFEqual(deviceProtocolName, CFSTR("Secure Digital"))); BOOL op = ejectable &&
( (deviceProtocolName != nullptr && (CFEqual(deviceProtocolName, CFSTR("USB")) || CFEqual(deviceProtocolName, CFSTR("Secure Digital")))) ||
(deviceModelKey != nullptr && CFEqual(deviceModelKey, CFSTR("SD Card Reader"))) );
//!CFEqual(deviceModelKey, CFSTR("Disk Image")); //!CFEqual(deviceModelKey, CFSTR("Disk Image"));
if (op) if (op)
[result addObject:volURL.path]; [result addObject:volURL.path];