mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-02-27 10:30:52 -08:00
Code Issues Projects Releases Packages Wiki Activity

Fix 'screen' module can't be used before the app 'ready' event bug (#198)

Browse source
This commit is contained in:
Quang Lam 2020-04-17 01:41:49 +07:00 • committed by GitHub
parent efeb91249a
commit 6f09a84a11
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

51
public/electron.js
View file

@ -62,32 +62,33 @@ if (!gotTheLock) {
loadListeners();
const commonInit = () => {
const {
hibernateUnusedWorkspacesAtLaunch,
proxyBypassRules,
proxyPacScript,
proxyRules,
proxyType,
themeSource,
} = getPreferences();
// configure proxy for default session
if (proxyType === 'rules') {
session.defaultSession.setProxy({
proxyRules,
proxyBypassRules,
});
} else if (proxyType === 'pacScript') {
session.defaultSession.setProxy({
proxyPacScript,
proxyBypassRules,
});
}
nativeTheme.themeSource = themeSource;
mainWindow.createAsync()
app.whenReady()
.then(() => mainWindow.createAsync())
.then(() => {
const {
hibernateUnusedWorkspacesAtLaunch,
proxyBypassRules,
proxyPacScript,
proxyRules,
proxyType,
themeSource,
} = getPreferences();
// configure proxy for default session
if (proxyType === 'rules') {
session.defaultSession.setProxy({
proxyRules,
proxyBypassRules,
});
} else if (proxyType === 'pacScript') {
session.defaultSession.setProxy({
proxyPacScript,
proxyBypassRules,
});
}
nativeTheme.themeSource = themeSource;
createMenu();
nativeTheme.addListener('updated', () => {