[Bootstrap] Simplify logging and some modules passing to core startup

main
Oj 2 years ago
parent 591d49d266
commit f4cfbb21a1

16
src/bootstrap.js vendored

@ -30,12 +30,8 @@ log('BuildInfo', 'Loaded build info', buildInfo);
const errorHandler = require('./errorHandler'); const errorHandler = require('./errorHandler');
errorHandler.init(); errorHandler.init();
// Just required for startup
const appSettings = require('./appSettings');
const GPUSettings = require('./GPUSettings');
const crashReporterSetup = require('./crashReporterSetup');
const splashScreen = require('./splash'); const splashScreen = require('./splash');
const autoStart = require('./autoStart'); const appSettings = require('./appSettings');
const updater = require('./updater/updater'); const updater = require('./updater/updater');
const moduleUpdater = require('./updater/moduleUpdater'); const moduleUpdater = require('./updater/moduleUpdater');
@ -47,19 +43,19 @@ if (!settings.get('enableHardwareAcceleration', true)) app.disableHardwareAccele
let desktopCore; let desktopCore;
const startCore = () => { const startCore = () => {
desktopCore = require('discord_desktop_core'); desktopCore = require('discord_desktop_core');
log('Bootstrap', 'Required desktop_core:', desktopCore); log('Bootstrap', 'Required core');
desktopCore.startup({ desktopCore.startup({
paths, paths,
splashScreen, splashScreen,
moduleUpdater, moduleUpdater,
autoStart,
buildInfo, buildInfo,
appSettings, appSettings,
Constants, Constants,
GPUSettings,
updater, updater,
crashReporterSetup, GPUSettings: require('./GPUSettings'),
autoStart: require('./autoStart'),
crashReporterSetup: require('./crashReporterSetup'),
}); });
const i = setImmediate(() => { const i = setImmediate(() => {
@ -101,7 +97,7 @@ const startUpdate = () => {
startCore(); startCore();
}, () => { }, () => {
log('Bootstrap', 'Setting main window visible'); log('Bootstrap', 'Main window visible');
desktopCore.setMainWindowVisible(!startMinimized); desktopCore.setMainWindowVisible(!startMinimized);
setTimeout(() => { // Try to update our asar setTimeout(() => { // Try to update our asar

Loading…
Cancel
Save