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

[Splash > Backend] Revert last commit as causing potential issues

This commit is contained in:
Ducko 2022-04-07 14:52:07 +01:00
parent 116c3e3e0e
commit ee70b23cb4
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/splash/index.js
View File

@ -8,12 +8,14 @@ const updater = require("../updater/updater");
let splashState = {}; let splashState = {};
let modulesListeners = {}; let modulesListeners = {};
let launchedMainWindow = false;
let updateAttempt = 0; let updateAttempt = 0;
let win, newUpdater, done; let splashWindow, newUpdater;
exports.initSplash = (startMin = false) => { exports.initSplash = (startMin = false) => {
newUpdater = updater.getUpdater(); newUpdater = updater.getUpdater();
if (newUpdater == null) initModuleUpdater(); if (newUpdater == null) initModuleUpdater();
launchSplash(startMin); launchSplash(startMin);
@ -28,48 +30,48 @@ exports.initSplash = (startMin = false) => {
destroySplash(); destroySplash();
launchMain(); launchMain();
setTimeout(() => { setTimeout(() => {
events.emit('APP_SHOULD_SHOW'); events.emit('APP_SHOULD_SHOW');
}, 100); }, 100);
}, 300); }, 300);
}; };
exports.focusWindow = () => win?.focus?.(); exports.focusWindow = () => splashWindow?.focus?.();
const destroySplash = () => {
win?.setSkipTaskbar?.(true);
setTimeout(() => {
if (!win) return;
win.hide();
win.close();
win = null;
}, 100);
};
exports.pageReady = () => destroySplash() || process.nextTick(() => events.emit('APP_SHOULD_SHOW')); exports.pageReady = () => destroySplash() || process.nextTick(() => events.emit('APP_SHOULD_SHOW'));
const destroySplash = () => {
splashWindow?.setSkipTaskbar?.(true);
setTimeout(() => {
if (!splashWindow) return;
splashWindow.hide();
splashWindow.close();
splashWindow = null;
}, 100);
};
const launchMain = () => { const launchMain = () => {
for (const e in modulesListeners) moduleUpdater.events.removeListener(e, modulesListeners[e]); // Remove updater v1 listeners for (const e in modulesListeners) moduleUpdater.events.removeListener(e, modulesListeners[e]); // Remove updater v1 listeners
done = true; if (!launchedMainWindow && splashWindow != null) {
sendState('starting');
sendState('starting'); launchedMainWindow = true;
events.emit('APP_SHOULD_LAUNCH'); events.emit('APP_SHOULD_LAUNCH');
}
}; };
const sendState = (status) => { const sendState = (status) => {
try { try {
win.webContents.send('state', { status, ...splashState }); splashWindow.webContents.send('state', { status, ...splashState });
} catch (_e) {} } catch (_e) {}
}; };
const launchSplash = (startMin) => { const launchSplash = (startMin) => {
win = new BrowserWindow({ splashWindow = new BrowserWindow({
width: 300, width: 300,
height: process.platform === 'darwin' ? 300 : 350, height: process.platform === 'darwin' ? 300 : 350,
frame: false, frame: false,
@ -82,9 +84,10 @@ const launchSplash = (startMin) => {
} }
}); });
const win = splashWindow;
const wc = win.webContents; const wc = win.webContents;
if (process.platform !== 'darwin') win.on('closed', () => !done && app.quit()); if (process.platform !== 'darwin') win.on('closed', () => !launchedMainWindow && app.quit());
wc.once('dom-ready', () => { wc.once('dom-ready', () => {
if (oaConfig.themeSync !== false) wc.insertCSS(JSON.parse(fs.readFileSync(join(paths.getUserData(), 'userDataCache.json'), 'utf8')).openasarSplashCSS); if (oaConfig.themeSync !== false) wc.insertCSS(JSON.parse(fs.readFileSync(join(paths.getUserData(), 'userDataCache.json'), 'utf8')).openasarSplashCSS);