starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-07-31 04:54:06 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

Add debug messages for update methods

Browse Source
This commit is contained in:
rafael-aero
2022-02-10 00:00:51 +01:00
parent 13a3753214
commit c8552041fb
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ElectronNET.Host/api/autoUpdater.js
View File

@@ -101,9 +101,12 @@ module.exports = (socket, app) => {
});
});
socket.on('autoUpdaterQuitAndInstall', async (isSilent, isForceRunAfter) => {
console.log('running autoUpdaterQuitAndInstall');
app.removeAllListeners("window-all-closed");
const windows = electron_1.BrowserWindow.getAllWindows();
if (windows.length) {
if (windows && windows.length) {
windows.forEach(w => {
try {
w.removeAllListeners('close');
@@ -118,6 +121,9 @@ module.exports = (socket, app) => {
//The call to quitAndInstall needs to happen after the windows
//get a chance to close and release resources, so it must be done on a timeout
setTimeout(() => {
console.log('running autoUpdater.quitAndInstall');
console.log('isSilent:' + isSilent);
console.log('isForceRunAfter:' + isForceRunAfter);
electron_updater_1.autoUpdater.quitAndInstall(isSilent, isForceRunAfter);
}, 100);
});

7
ElectronNET.Host/api/autoUpdater.ts
View File

@@ -130,9 +130,11 @@ export = (socket: Socket, app: Electron.App) => {
});
socket.on('autoUpdaterQuitAndInstall', async (isSilent, isForceRunAfter) => {
console.log('running autoUpdaterQuitAndInstall');
app.removeAllListeners("window-all-closed");
const windows = BrowserWindow.getAllWindows();
if (windows.length) {
if (windows && windows.length) {
windows.forEach(w => {
try {
w.removeAllListeners('close');
@@ -147,6 +149,9 @@ export = (socket: Socket, app: Electron.App) => {
//The call to quitAndInstall needs to happen after the windows
//get a chance to close and release resources, so it must be done on a timeout
setTimeout(() => {
console.log('running autoUpdater.quitAndInstall');
console.log('isSilent:' + isSilent);
console.log('isForceRunAfter:' + isForceRunAfter);
autoUpdater.quitAndInstall(isSilent, isForceRunAfter);
}, 100);
});

7
ElectronNET.Host/main.js
View File

@@ -55,6 +55,8 @@ app.on('will-finish-launching', () => {
});
function prepareForUpdate() {
console.log('closing all windows before update');
ignoreApiProcessClosed = true;
app.removeAllListeners("window-all-closed");
@@ -487,14 +489,19 @@ function startAspCoreBackendWithWatch(electronPort) {
if (code != 0) {
console.log(`Will quit Electron, as exit code != 0 (got ${code})`);
}
console.log('Will quit Electron now');
app.exit(code);
}
else if (os.platform() === 'darwin') {
console.log('.NET process and Electron has a pending update, will force quit in 10s...');
//There is a bug on the updater on macOS never quiting and starting the update process
//We give Squirrel.Mac enough time to access the update file, and then just force-exit here
setTimeout(() => app.exit(0), 10_000);
}
else {
console.log('.NET process and Electron has a pending update...');
}
});
if (detachedProcess) {