From 3c5d471ec7935a29a18c6e4c0239d4e6293c64c3 Mon Sep 17 00:00:00 2001
From: Michelle Tilley <binarymuse@github.com>
Date: Tue, 19 Sep 2017 10:41:53 -0700
Subject: [PATCH] Fix bugs in urlMain handling

---
 src/main-process/atom-application.coffee | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main-process/atom-application.coffee b/src/main-process/atom-application.coffee
index f1a1e578e..2191b108f 100644
--- a/src/main-process/atom-application.coffee
+++ b/src/main-process/atom-application.coffee
@@ -653,7 +653,7 @@ class AtomApplication
 
     pack = @findPackageWithName(parsedUrl.host, devMode)
     if pack?.urlMain
-      @openPackageUrlMain(urlToOpen, devMode, safeMode, env)
+      @openPackageUrlMain(parsedUrl.host, urlToOpen, devMode, safeMode, env)
     else
       @openWithAtomUrl(urlToOpen, devMode, safeMode, env)
 
@@ -674,6 +674,15 @@ class AtomApplication
         @lastFocusedWindow.sendUrlMessage url
 
   findPackageWithName: (packageName, devMode) ->
+    _.find @getPackageManager().getAvailablePackageMetadata(), ({name}) -> name is packageName
+
+  openPackageUrlMain: (packageName, urlToOpen, devMode, safeMode, env) ->
+    packagePath = @getPackageManager().resolvePackagePath(packageName)
+    windowInitializationScript = path.resolve(packagePath, pack.urlMain)
+    windowDimensions = @getDimensionsForNewWindow()
+    new AtomWindow(this, @fileRecoveryService, {windowInitializationScript, @resourcePath, devMode, safeMode, urlToOpen, windowDimensions, env})
+
+  getPackageManager: ->
     unless @packages?
       PackageManager = require '../package-manager'
       @packages = new PackageManager({})
@@ -682,13 +691,8 @@ class AtomApplication
         devMode: devMode
         resourcePath: @resourcePath
 
-    _.find @packages.getAvailablePackageMetadata(), ({name}) -> name is packageName
+    @packages
 
-  openPackageUrlMain: (urlToOpen, devMode, safeMode, env) ->
-    packagePath = @packages.resolvePackagePath(packageName)
-    windowInitializationScript = path.resolve(packagePath, pack.urlMain)
-    windowDimensions = @getDimensionsForNewWindow()
-    new AtomWindow(this, @fileRecoveryService, {windowInitializationScript, @resourcePath, devMode, safeMode, urlToOpen, windowDimensions, env})
 
   # Opens up a new {AtomWindow} to run specs within.
   #