From a7323cdc720c0cd0ee22ddb7606707f3e6802d56 Mon Sep 17 00:00:00 2001 From: Evan Morikawa Date: Wed, 23 Sep 2015 10:50:42 -0700 Subject: [PATCH] fix(bootup): don't show unresponsive dialog until main window loaded Summary: Fixes T3496 This is a patch just so that simple modal doesn't show. Test Plan: manual Reviewers: bengotow Reviewed By: bengotow Maniphest Tasks: T3496 Differential Revision: https://phab.nylas.com/D2053 --- src/atom.coffee | 2 +- src/browser/atom-window.coffee | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/atom.coffee b/src/atom.coffee index 4cbf17d2d..4e4142982 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -679,7 +679,7 @@ class Atom extends Model # Make sure we can't be made so small that the interface looks like crap @getCurrentWindow().setMinimumSize(875, 500) wait 20, => - ipc.sendChannel('window-command', 'window:loaded') + ipc.sendChannel('window-command', 'window:main-window-content-loaded') cover.classList.add('visible') # Call this method when establishing a secondary application window diff --git a/src/browser/atom-window.coffee b/src/browser/atom-window.coffee index 8ecd959c2..ee24a9642 100644 --- a/src/browser/atom-window.coffee +++ b/src/browser/atom-window.coffee @@ -102,6 +102,12 @@ class AtomWindow if @browserWindow.loadSettingsChangedSinceGetURL @browserWindow.webContents.send('load-settings-changed', @browserWindow.loadSettings) + @browserWindow.once 'window:main-window-content-loaded', => + @emit 'window:main-window-content-loaded' + @mainWindowContentLoaded = true + if @browserWindow.loadSettingsChangedSinceGetURL + @browserWindow.webContents.send('load-settings-changed', @browserWindow.loadSettings) + @browserWindow.loadUrl(@getUrl(loadSettings)) @browserWindow.focusOnWebView() if @isSpec @@ -158,6 +164,7 @@ class AtomWindow @browserWindow.on 'unresponsive', => return if @isSpec + return if (not @mainWindowContentLoaded) and @mainWindow dialog = require 'dialog' chosen = dialog.showMessageBox @browserWindow,