diff --git a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m index 71d5283318..baa8907d46 100644 --- a/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m +++ b/Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m @@ -321,26 +321,25 @@ - (void)conferenceJoined:(NSDictionary *)data - (void)conferenceTerminated:(NSDictionary *)data { + // If the call is terminated by a moderator the error key contains the "conference.destroyed" value if (data[kJitsiDataErrorKey] != nil) { MXLogDebug(@"[JitsiViewController] conferenceTerminated - data: %@", data); } - else - { - dispatch_async(dispatch_get_main_queue(), ^{ - - // The conference is over. Let the delegate close this view controller. - if (self.delegate) - { - [self.delegate jitsiViewController:self dismissViewJitsiController:nil]; - } - else - { - // Do it ourself - [self dismissViewControllerAnimated:YES completion:nil]; - } - }); - } + + dispatch_async(dispatch_get_main_queue(), ^{ + + // The conference is over. Let the delegate close this view controller. + if (self.delegate) + { + [self.delegate jitsiViewController:self dismissViewJitsiController:nil]; + } + else + { + // Do it ourself + [self dismissViewControllerAnimated:YES completion:nil]; + } + }); } - (void)enterPictureInPicture:(NSDictionary *)data diff --git a/changelog.d/7709.bugfix b/changelog.d/7709.bugfix new file mode 100644 index 0000000000..0a77faa72d --- /dev/null +++ b/changelog.d/7709.bugfix @@ -0,0 +1 @@ +If a moderator ends a Jitsi call for everyone the call is now dismissed. \ No newline at end of file