diff --git a/lib/startup-renderer.js b/lib/startup-renderer.js index e6dff20..a49801b 100644 --- a/lib/startup-renderer.js +++ b/lib/startup-renderer.js @@ -15,14 +15,31 @@ function createStartupQuery(config, version) { function createStartupWindow(BrowserWindow, options) { const window = new BrowserWindow({ ...options, show: false }); - window.once('ready-to-show', () => { + let nativePaintReady = false; + let rendererLoadFinished = false; + let revealed = false; + const reveal = () => { + if (revealed || !nativePaintReady || !rendererLoadFinished) return; + revealed = true; window.show(); + }; + window.once('ready-to-show', () => { + nativePaintReady = true; + reveal(); + }); + window.webContents.once('did-finish-load', () => { + rendererLoadFinished = true; + reveal(); }); return { window, load(target, onLoadError, options) { - return window.loadFile(target, options).catch(onLoadError); + return window.loadFile(target, options).catch((error) => { + rendererLoadFinished = true; + reveal(); + return onLoadError(error); + }); } }; } diff --git a/renderer/index.html b/renderer/index.html index 537a915..1a97fb3 100644 --- a/renderer/index.html +++ b/renderer/index.html @@ -55,7 +55,10 @@