mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Ignore more ERR_FAILED instances

Browse source
This commit is contained in:
Fedor Indutny 2023-02-27 10:46:00 -08:00 • committed by GitHub
parent 0e655ceeed
commit 85adb39d31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/main.ts
View file

@ -670,10 +670,20 @@ async function getTitleBarOverlay(): Promise<TitleBarOverlayOptions | false> {
} }
async function safeLoadURL(window: BrowserWindow, url: string): Promise<void> { async function safeLoadURL(window: BrowserWindow, url: string): Promise<void> {
let wasDestroyed = false;
const onDestroyed = () => {
wasDestroyed = true;
};
window.webContents.on('did-stop-loading', onDestroyed);
window.webContents.on('destroyed', onDestroyed);
try { try {
await window.loadURL(url); await window.loadURL(url);
} catch (error) { } catch (error) {
if (windowState.readyForShutdown() && error?.code === 'ERR_FAILED') { if (
(wasDestroyed || windowState.readyForShutdown()) &&
error?.code === 'ERR_FAILED'
) {
getLogger().warn( getLogger().warn(
'safeLoadURL: ignoring ERR_FAILED because we are shutting down', 'safeLoadURL: ignoring ERR_FAILED because we are shutting down',
error error
@ -681,6 +691,9 @@ async function safeLoadURL(window: BrowserWindow, url: string): Promise<void> {
return; return;
} }
throw error; throw error;
} finally {
window.webContents.removeListener('did-stop-loading', onDestroyed);
window.webContents.removeListener('destroyed', onDestroyed);
} }
} }