Fix exception being thrown by favicon library when a URL doesn't have…

… a host (eg. `about:blank`)
josh- · Mar 13, 2018 · cc13588 · cc13588
1 parent c661b06
commit cc13588
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/CloudyTabs/JPAppDelegate.m b/CloudyTabs/JPAppDelegate.m
@@ -34,6 +34,8 @@ @interface JPAppDelegate ()
 
 @implementation JPAppDelegate
 
+const NSSize ICON_SIZE = {19, 19};
+
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
     if ([JPCloudTabsDBReader canReadFile]) {
@@ -221,14 +223,17 @@ - (void)updateMenu
 
             tabMenuItem.representedObject = URL;
             tabMenuItem.toolTip = URL.relativeString;
-
-            __block NSImage *image = [[DSFavIconManager sharedInstance] iconForURL:tabMenuItem.representedObject downloadHandler:^(NSImage *icon) {
-                icon.size = NSMakeSize(19, 19);
-                [tabMenuItem setImage:icon];
-            }];
-            image.size = NSMakeSize(19, 19);
-            [tabMenuItem setImage:image];
-
+
+            if (URL.host != nil) {
+                tabMenuItem.image = [[DSFavIconManager sharedInstance] iconForURL:tabMenuItem.representedObject downloadHandler:^(NSImage *image) {
+                    image.size = ICON_SIZE;
+                    tabMenuItem.image = image;
+                }];
+            } else {
+                tabMenuItem.image = [DSFavIconManager sharedInstance].placeholder;
+            }
+            tabMenuItem.image.size = ICON_SIZE;
+
             [self.menu addItem:tabMenuItem];
         }
     }