Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-22 15:15:12 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(bootup): don't show unresponsive dialog until main window loaded

Browse source 
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
This commit is contained in:
Evan Morikawa 2015-09-23 10:50:42 -07:00
parent e729d1fe40
commit a7323cdc72
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/atom.coffee
View file

@ -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

7
src/browser/atom-window.coffee
View file

@ -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,