Merge pull request #27 from jonchui/master

Fixes startup crash. by checking for nil, before calling #takeRetainedValue
luosheng · May 16, 2017 · a1923a0 · a1923a0
2 parents e554a3d + fc6ba4d
commit a1923a0
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/OpenSim/LaunchAtLoginHelper.swift b/OpenSim/LaunchAtLoginHelper.swift
@@ -26,10 +26,13 @@ func existingItem(itemUrl: URL) -> LSSharedFileListItem? {
     if let currentItems = LSSharedFileListCopySnapshot(loginItems, &seed).takeRetainedValue() as? [LSSharedFileListItem] {
         for item in currentItems {
             let resolutionFlags = UInt32(kLSSharedFileListNoUserInteraction | kLSSharedFileListDoNotMountVolumes)
-            let url = LSSharedFileListItemCopyResolvedURL(item, resolutionFlags, nil).takeRetainedValue() as URL
-            if itemUrl == url {
-                return item
+            if let cfurl = LSSharedFileListItemCopyResolvedURL(item, resolutionFlags, nil) {
+                let url = cfurl.takeRetainedValue() as URL
+                if itemUrl == url {
+                    return item
+                }
             }
+
         }
     }
     return nil