mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Fully close Jitsi conferences on errors (#22060)

Browse source 
By not closing Jitsi fully when an error occurs, it could get stuck in
PiP mode with no way to dismiss.
This commit is contained in:
Robin 2022-05-05 05:51:00 -04:00 • committed by GitHub
parent abb31c9b01
commit 9cb0185ec2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/vector/jitsi/index.ts
View file

@ -301,6 +301,15 @@ async function notifyHangup() {
} }
} }
function closeConference() {
switchVisibleContainers();
document.getElementById("jitsiContainer").innerHTML = "";
if (skipOurWelcomeScreen) {
skipToJitsiSplashScreen();
}
}
// event handler bound in HTML // event handler bound in HTML
function joinConference(audioDevice?: string, videoDevice?: string) { function joinConference(audioDevice?: string, videoDevice?: string) {
let jwt; let jwt;
@ -386,20 +395,15 @@ function joinConference(audioDevice?: string, videoDevice?: string) {
meetApi = null; meetApi = null;
}); });
meetApi.on("readyToClose", () => { meetApi.on("readyToClose", closeConference);
switchVisibleContainers();
document.getElementById("jitsiContainer").innerHTML = "";
if (skipOurWelcomeScreen) {
skipToJitsiSplashScreen();
}
});
meetApi.on("errorOccurred", ({ error }) => { meetApi.on("errorOccurred", ({ error }) => {
if (error.isFatal) { if (error.isFatal) {
// We got disconnected. Since Jitsi Meet might send us back to the // We got disconnected. Since Jitsi Meet might send us back to the
// prejoin screen, we're forced to act as if we hung up entirely. // prejoin screen, we're forced to act as if we hung up entirely.
notifyHangup(); notifyHangup();
meetApi = null;
closeConference();
} }
}); });