Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(desktop): refresh crash in any page #1246

Merged
merged 1 commit into from
Dec 27, 2021
Merged

fix(desktop): refresh crash in any page #1246

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions desktop/main-app/src/window-manager/window-main/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,23 @@ export class WindowMain extends AbstractWindow<false> {
});

ipcMain.on("preload-load", event => {
this.subject.preloadLoad.next(event);
// preload-load is global event, any window create will trigger,
// but we only need Main window event
if (event.sender.id === win.window.webContents.id) {
this.subject.preloadLoad.next(event);
}
});

// use the zip operator to solve the problem of not sending xx event after refreshing the page
// wait until the dom element is ready and the preload is ready, then inject agora-electron-sdk
// otherwise the window in the preload may not be ready
// don’t worry about sending multiple times, because once is used in preload.ts
// link: https://www.learnrxjs.io/learn-rxjs/operators/combination/zip
zip(this.subject.domReady, this.subject.preloadLoad)
.pipe(
mergeMap(([, event]) => {
event.sender.send("inject-agora-electron-sdk-addon");
if (!event.sender.isDestroyed()) {
event.sender.send("inject-agora-electron-sdk-addon");
}
return [];
}),
ignoreElements(),
Expand Down