Merge pull request #8779 from atom/cz-electron-32

Update to Electron v0.33.x

src/browser/atom-protocol-handler.coffee

@@ -29,7 +29,7 @@ class AtomProtocolHandler
 
   # Creates the 'atom' custom protocol handler.
   registerAtomProtocol: ->
-    protocol.registerProtocol 'atom', (request) =>
+    protocol.registerFileProtocol 'atom', (request, callback) =>
       relativePath = path.normalize(request.url.substr(7))
 
       if relativePath.indexOf('assets/') is 0
@@ -41,4 +41,4 @@ class AtomProtocolHandler
           filePath = path.join(loadPath, relativePath)
           break if fs.statSyncNoException(filePath).isFile?()
 
-      new protocol.RequestFileJob(filePath)
+      callback(filePath)

src/browser/atom-window.coffee

@@ -88,7 +88,7 @@ class AtomWindow
       hash: encodeURIComponent(JSON.stringify(loadSettings))
 
   getLoadSettings: ->
-    if @browserWindow.webContents?.loaded
+    if @browserWindow.webContents? and not @browserWindow.webContents.isLoading()
       hash = url.parse(@browserWindow.webContents.getUrl()).hash.substr(1)
       JSON.parse(decodeURIComponent(hash))