From 5f2b5a16dfeb340b323896b62d9fcd8e613ac91c Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Sat, 26 Sep 2015 16:38:51 -0600
Subject: [PATCH] Use WebContents.prototype.isLoading instead of defunct
 .loaded

Fixes cmd-o interaction.
---
 src/browser/atom-window.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/atom-window.coffee b/src/browser/atom-window.coffee
index 3be46b5fc..3cbf277ea 100644
--- a/src/browser/atom-window.coffee
+++ b/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))