Merge branch '23-url-event-racing'

Author: dteoh

devdocs-macos/AppDelegate.swift

@@ -9,12 +9,19 @@ public extension Notification.Name {
 class AppDelegate: NSObject, NSApplicationDelegate {
     func applicationWillFinishLaunching(_ notification: Notification) {
         let _ = DocumentationWindows.shared
+        URLEventHandler.shared.install()
     }
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
         Summoner.shared.install()
-        URLEventHandler.shared.install()
-        DocumentationWindows.shared.restore()
+
+        if GeneralPreferences.shouldRestoreDocs() {
+            DocumentationWindows.shared.restore()
+        }
+
+        DispatchQueue.main.async {
+            DocumentationWindows.shared.newWindowIfNoWindow()
+        }
     }
 
     func applicationWillTerminate(_ aNotification: Notification) {

devdocs-macos/DocumentationWindows.swift

@@ -44,10 +44,6 @@ class DocumentationWindows: NSObject {
     }
 
     func restore() {
-        if !GeneralPreferences.shouldRestoreDocs() {
-            newWindow()
-            return
-        }
         if let urls = Storage.getLocations() {
             urls.filter { url -> Bool in
                 if let host = url.host {
@@ -58,8 +54,6 @@ class DocumentationWindows: NSObject {
             }.forEach { url in
                 newWindow(forURL: url)
             }
-        } else {
-            newWindow()
         }
     }
 }