kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-22 13:09:26 +00:00
Code Issues Projects Releases Wiki Activity

fix electron not running under windows (after async changes) (#3091)

Browse Source 
fixes #3083 

tested under windows 11 and linux.
This commit is contained in:
Karsten Hassel
2023-04-12 08:25:07 +02:00
committed by GitHub
parent 4e3369062e
commit 979f4ec664
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -28,6 +28,7 @@ _This release is scheduled to be released on 2023-07-01._
### Fixed ### Fixed
- Fix envcanada hourly forecast time (#3080) - Fix envcanada hourly forecast time (#3080)
- Fix electron not running under windows after async changes (#3083)
## [2.23.0] - 2023-04-04 ## [2.23.0] - 2023-04-04

15
js/electron.js
View File

@@ -126,13 +126,6 @@ function createWindow() {
}); });
} }
// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
app.on("ready", function () {
Log.log("Launching application.");
createWindow();
});
// Quit when all windows are closed. // Quit when all windows are closed.
app.on("window-all-closed", function () { app.on("window-all-closed", function () {
if (process.env.JEST_WORKER_ID !== undefined) { if (process.env.JEST_WORKER_ID !== undefined) {
@@ -178,5 +171,11 @@ app.on("certificate-error", (event, webContents, url, error, certificate, callba
// Start the core application if server is run on localhost // Start the core application if server is run on localhost
// This starts all node helpers and starts the webserver. // This starts all node helpers and starts the webserver.
if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].includes(config.address)) { if (["localhost", "127.0.0.1", "::1", "::ffff:127.0.0.1", undefined].includes(config.address)) {
core.start().then((c) => (config = c)); core.start().then((c) => {
config = c;
app.whenReady().then(() => {
Log.log("Launching application.");
createWindow();
});
});
} }