nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix origin migrator for SSO logins

Browse Source 
For some reason this was trying to close the same window twice
when the app was reloaded after an SSO login. Possibly also a
problem on electron < 6 - presumably a race condition.
This commit is contained in:
David Baker
2019-09-19 17:16:57 +01:00
parent 00130e6ac6
commit 835d7bfb9d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electron_app/src/originMigrator.js
View File

@@ -33,7 +33,7 @@ async function migrateFromOldOrigin() {
webgl: false, webgl: false,
}, },
}); });
ipcMain.on('origin_migration_complete', (e, success, sentSummary, storedSummary) => { ipcMain.once('origin_migration_complete', (e, success, sentSummary, storedSummary) => {
if (success) { if (success) {
console.log("Origin migration completed successfully!"); console.log("Origin migration completed successfully!");
} else { } else {
@@ -44,7 +44,7 @@ async function migrateFromOldOrigin() {
migrateWindow.close(); migrateWindow.close();
resolve(); resolve();
}); });
ipcMain.on('origin_migration_nodata', (e) => { ipcMain.once('origin_migration_nodata', (e) => {
console.log("No session to migrate from old origin"); console.log("No session to migrate from old origin");
migrateWindow.close(); migrateWindow.close();
resolve(); resolve();