fix: bugs

gbammc · Sep 30, 2016 · 7338742 · 7338742
1 parent 7cbcdbe
commit 7338742
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/Thor/AppModel.swift b/Thor/AppModel.swift
@@ -20,15 +20,20 @@ class AppModel: Equatable {
 
     var icon: NSImage? {
         get {
-            let bundle = Bundle(url: appBundleURL)!
+            guard let bundle = Bundle(url: appBundleURL) else {
+                return nil
+            }
+
             let compositeName = "\(bundle.bundleIdentifier):\(appIconName)"
-            if let file = bundle.pathForImageResource(appIconName), let bundleImage = NSImage(contentsOfFile: file) {
-                bundleImage.setName(compositeName)
-                bundleImage.size = NSSize(width: 36, height: 36)
-                return bundleImage
+
+            guard let file = bundle.pathForImageResource(appIconName), let bundleImage = NSImage(contentsOfFile: file) else {
+                return nil
             }
 
-            return nil
+            bundleImage.setName(compositeName)
+            bundleImage.size = NSSize(width: 36, height: 36)
+
+            return bundleImage
         }
     }