profxadke/OpenAsar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Splash] Move updater init to async with splash load

Browse source
This commit is contained in:
Ducko 2021-12-16 22:14:55 +00:00
parent 3e1a7ab81a
commit 78a4df22f4
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/splash/splashScreen.js
View file

@ -335,6 +335,12 @@ function initSplash(startMinimized = false) {
log('Splash', 'Quickstart config:', process.env.OPENASAR_QUICKSTART || oaConfig.quickstart, '-', process.env.OPENASAR_QUICKSTART, oaConfig.quickstart); log('Splash', 'Quickstart config:', process.env.OPENASAR_QUICKSTART || oaConfig.quickstart, '-', process.env.OPENASAR_QUICKSTART, oaConfig.quickstart);
if (newUpdater != null) {
updateUntilCurrent();
} else {
moduleUpdater.installPendingUpdates();
}
if (process.env.OPENASAR_QUICKSTART || oaConfig.quickstart) setTimeout(() => { if (process.env.OPENASAR_QUICKSTART || oaConfig.quickstart) setTimeout(() => {
destroySplash(); destroySplash();
@ -348,12 +354,12 @@ function initSplash(startMinimized = false) {
NodeModule.globalPaths.push(_path.default.join(modulesDir, moduleCoreDir)); // Add to globalPaths for requiring NodeModule.globalPaths.push(_path.default.join(modulesDir, moduleCoreDir)); // Add to globalPaths for requiring
} }
if (newUpdater != null) { /* if (newUpdater != null) {
updateUntilCurrent(); updateUntilCurrent();
} else { } else {
moduleUpdater.installPendingUpdates(); moduleUpdater.installPendingUpdates();
moduleUpdater.setInBackground(); moduleUpdater.setInBackground();
} } */
launchMainWindow(); launchMainWindow();
@ -469,12 +475,6 @@ function launchSplashWindow(startMinimized) {
if (splashWindow && !startMinimized) { if (splashWindow && !startMinimized) {
splashWindow.show(); splashWindow.show();
} }
if (newUpdater != null) {
updateUntilCurrent();
} else {
moduleUpdater.installPendingUpdates();
}
}); });
_ipcMain.default.on('SPLASH_SCREEN_QUIT', () => { _ipcMain.default.on('SPLASH_SCREEN_QUIT', () => {