Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor bug fix which caused system crash...

Browse source
This commit is contained in:
dj2ls 2022-02-23 22:15:19 +01:00
parent 0fa38a9835
commit 1a9d6bc884
3 changed files with 52 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gui/main.js
View file

@ -114,7 +114,9 @@ function createWindow() {
preload: require.resolve('./preload-main.js'),
nodeIntegration: true,
contextIsolation: false,
enableRemoteModule: false, //https://stackoverflow.com/questions/53390798/opening-new-window-electron/53393655 https://github.com/electron/remote
enableRemoteModule: false,
//https://stackoverflow.com/questions/53390798/opening-new-window-electron/53393655
//https://github.com/electron/remote
}
})
// hide menu bar
@ -146,9 +148,6 @@ function createWindow() {
// Emitted when the window is closed.
win.on('closed', function() {
// Dereference the window object, usually you would store windows
// in an array if your app supports multi windows, this is the time
// when you should delete the corresponding element.
win = null;
chat = null;
})
@ -159,14 +158,12 @@ function createWindow() {
autoUpdater.autoInstallOnAppQuit = false;
autoUpdater.autoDownload = true;
autoUpdater.checkForUpdatesAndNotify();
autoUpdater.quitAndInstall();
//autoUpdater.quitAndInstall();
});
chat.on('closed', function () {
// Dereference the window object, usually you would store windows
// in an array if your app supports multi windows, this is the time
// when you should delete the corresponding element.
})
@ -263,6 +260,8 @@ app.whenReady().then(() => {
})
app.on('window-all-closed', () => {
// closing the tnc binary if not closed when closing application and also our daemon which has been started by the gui
try {
daemonProcess.kill();
@ -284,7 +283,8 @@ app.on('window-all-closed', () => {
// on macOS we need to kill the daemon as well. If we are not doing this,
// the daemon wont startup again because the socket is already in use
console.log("kill daemon process...")
exec('pkill', ['-9', 'daemon'])
//for some reason killing the daemon is killing our screen..it seems theres another "daemon" out there...
//exec('pkill', ['-9', 'daemon'])
}
@ -292,6 +292,7 @@ app.on('window-all-closed', () => {
if (process.platform !== 'darwin') {
app.quit();
}
})
// IPC HANDLER
@ -416,3 +417,4 @@ autoUpdater.on('error', (progress) => {
ipcMain.on('restart_app', () => {
autoUpdater.quitAndInstall();
});

55
gui/package-lock.json generated
View file

@ -14,11 +14,11 @@
"bootswatch": "^5.1.3",
"chart.js": "^3.5.1",
"chartjs-plugin-annotation": "^1.0.2",
"electron-updater": "^4.6.5",
"electron-updater": "^5.0.0",
"qth-locator": "^2.1.0"
},
"devDependencies": {
"electron": "^17.0.0",
"electron": "^16.0.0",
"electron-builder": "^22.14.13"
},
"engines": {
@ -777,6 +777,7 @@
"version": "8.9.2",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
"integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
"dev": true,
"dependencies": {
"debug": "^4.3.2",
"sax": "^1.2.4"
@ -1348,9 +1349,9 @@
}
},
"node_modules/electron": {
"version": "17.0.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-17.0.1.tgz",
"integrity": "sha512-CBReR/QEOpgwMdt59lWCtj9wC8oHB6aAjMF1lhXcGew132xtp+C5N6EaXb/fmDceVYLouziYjbNcpeXsWrqdpA==",
"version": "16.0.10",
"resolved": "https://registry.npmjs.org/electron/-/electron-16.0.10.tgz",
"integrity": "sha512-QSxkVpvSpLzhSVlPRVOoJc/O/ZsbZm64qvSJeXsYfaH4rQjqBJwAFPuHhbhxzrBDWjH6FrBiNNzWZufSoTz1QQ==",
"dev": true,
"hasInstallScript": true,
"dependencies": {
@ -1526,12 +1527,12 @@
}
},
"node_modules/electron-updater": {
"version": "4.6.5",
"resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.6.5.tgz",
"integrity": "sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA==",
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-5.0.0.tgz",
"integrity": "sha512-SC3sw92ewjrJFZIJamVOHqxW3yzFin/Q/Swf2FZodqm9xd4s8hCbPCfptpD/xBIcvQmAv2BAggbprwWq/fyp6w==",
"dependencies": {
"@types/semver": "^7.3.6",
"builder-util-runtime": "8.9.2",
"builder-util-runtime": "9.0.0",
"fs-extra": "^10.0.0",
"js-yaml": "^4.1.0",
"lazy-val": "^1.0.5",
@ -1540,6 +1541,18 @@
"semver": "^7.3.5"
}
},
"node_modules/electron-updater/node_modules/builder-util-runtime": {
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.0.0.tgz",
"integrity": "sha512-SkpEtSmTkREDHRJnxKEv43aAYp8sYWY8fxYBhGLBLOBIRXeaIp6Kv3lBgSD7uR8jQtC7CA659sqJrpSV6zNvSA==",
"dependencies": {
"debug": "^4.3.2",
"sax": "^1.2.4"
},
"engines": {
"node": ">=12.0.0"
}
},
"node_modules/electron-updater/node_modules/fs-extra": {
"version": "10.0.1",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",
@ -4046,6 +4059,7 @@
"version": "8.9.2",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz",
"integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==",
"dev": true,
"requires": {
"debug": "^4.3.2",
"sax": "^1.2.4"
@ -4459,9 +4473,9 @@
}
},
"electron": {
"version": "17.0.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-17.0.1.tgz",
"integrity": "sha512-CBReR/QEOpgwMdt59lWCtj9wC8oHB6aAjMF1lhXcGew132xtp+C5N6EaXb/fmDceVYLouziYjbNcpeXsWrqdpA==",
"version": "16.0.10",
"resolved": "https://registry.npmjs.org/electron/-/electron-16.0.10.tgz",
"integrity": "sha512-QSxkVpvSpLzhSVlPRVOoJc/O/ZsbZm64qvSJeXsYfaH4rQjqBJwAFPuHhbhxzrBDWjH6FrBiNNzWZufSoTz1QQ==",
"dev": true,
"requires": {
"@electron/get": "^1.13.0",
@ -4603,12 +4617,12 @@
}
},
"electron-updater": {
"version": "4.6.5",
"resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.6.5.tgz",
"integrity": "sha512-kdTly8O9mSZfm9fslc1mnCY+mYOeaYRy7ERa2Fed240u01BKll3aiupzkd07qKw69KvhBSzuHroIW3mF0D8DWA==",
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-5.0.0.tgz",
"integrity": "sha512-SC3sw92ewjrJFZIJamVOHqxW3yzFin/Q/Swf2FZodqm9xd4s8hCbPCfptpD/xBIcvQmAv2BAggbprwWq/fyp6w==",
"requires": {
"@types/semver": "^7.3.6",
"builder-util-runtime": "8.9.2",
"builder-util-runtime": "9.0.0",
"fs-extra": "^10.0.0",
"js-yaml": "^4.1.0",
"lazy-val": "^1.0.5",
@ -4617,6 +4631,15 @@
"semver": "^7.3.5"
},
"dependencies": {
"builder-util-runtime": {
"version": "9.0.0",
"resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.0.0.tgz",
"integrity": "sha512-SkpEtSmTkREDHRJnxKEv43aAYp8sYWY8fxYBhGLBLOBIRXeaIp6Kv3lBgSD7uR8jQtC7CA659sqJrpSV6zNvSA==",
"requires": {
"debug": "^4.3.2",
"sax": "^1.2.4"
}
},
"fs-extra": {
"version": "10.0.1",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.1.tgz",

4
gui/package.json
View file

@ -1,6 +1,6 @@
{
"name": "FreeDATA",
"version": "0.0.1-alpha.7",
"version": "0.0.1-alpha.8",
"description": "FreeDATA ",
"main": "main.js",
"scripts": {
@ -34,7 +34,7 @@
"bootswatch": "^5.1.3",
"chart.js": "^3.5.1",
"chartjs-plugin-annotation": "^1.0.2",
"electron-updater": "^4.6.5",
"electron-updater": "^5.0.0",
"qth-locator": "^2.1.0"
},
"devDependencies": {