Merge pull request #27 from jonchui/master

luosheng · web-flow · commit a1923a0b08a0 · 2017-05-16T10:16:16.000+08:00
Fixes startup crash. by checking for nil, before calling #takeRetainedValue
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

Original file line number	Diff line number	Diff line change
`@@ -26,10 +26,13 @@ func existingItem(itemUrl: URL) -> LSSharedFileListItem? {`
`26`	`26`	`if let currentItems = LSSharedFileListCopySnapshot(loginItems, &seed).takeRetainedValue() as? [LSSharedFileListItem] {`
`27`	`27`	`for item in currentItems {`
`28`	`28`	`let resolutionFlags = UInt32(kLSSharedFileListNoUserInteraction \| kLSSharedFileListDoNotMountVolumes)`
`29`		`- let url = LSSharedFileListItemCopyResolvedURL(item, resolutionFlags, nil).takeRetainedValue() as URL`
`30`		`- if itemUrl == url {`
`31`		`- return item`
	`29`	`+ if let cfurl = LSSharedFileListItemCopyResolvedURL(item, resolutionFlags, nil) {`
	`30`	`+ let url = cfurl.takeRetainedValue() as URL`
	`31`	`+ if itemUrl == url {`
	`32`	`+ return item`
	`33`	`+ }`
`32`	`34`	`}`
	`35`	`+`
`33`	`36`	`}`
`34`	`37`	`}`
`35`	`38`	`return nil`