Merge pull request #26 from 166MMX/crash-fixes

Fix crash where login items could not be resolved
macfusion-ng · Oct 17, 2016 · 04b53f6 · 04b53f6
2 parents 4932376 + 6d692eb
commit 04b53f6
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/MFCore/MFCore.m b/MFCore/MFCore.m
@@ -78,7 +78,10 @@ BOOL mfcGetStateOfLoginItemWithPath(NSString *path) {
 	for(CFIndex i = 0; i < arrayCount; ++i) {
         CFURLRef urlRef;
 		LSSharedFileListItemRef itemRef = (LSSharedFileListItemRef)CFArrayGetValueAtIndex(loginItems, i);
-		LSSharedFileListItemResolve(itemRef, 0, &urlRef, NULL);
+		OSStatus status = LSSharedFileListItemResolve(itemRef, 0, &urlRef, NULL);
+		if (status != noErr) {
+			continue;
+		}
 		NSURL *theURL = (__bridge NSURL*) urlRef;
         present = [[theURL path] isEqualToString:path];
         CFRelease(urlRef);
@@ -109,7 +112,10 @@ BOOL mfcSetStateForAgentLoginItem(BOOL state) {
 	for(CFIndex i = 0; i < arrayCount; ++i) {
         CFURLRef urlRef;
 		LSSharedFileListItemRef itemRef = (LSSharedFileListItemRef)CFArrayGetValueAtIndex(loginItems, i);
-		LSSharedFileListItemResolve(itemRef, 0, &urlRef, NULL);
+		OSStatus status = LSSharedFileListItemResolve(itemRef, 0, &urlRef, NULL);
+		if (status != noErr) {
+			continue;
+		}
 		NSURL *theURL = (__bridge NSURL*) urlRef;
 		NSString* checkPath = [[theURL path] lastPathComponent];
         CFRelease(urlRef);