OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3569 from matrix-org/t3chguy/CallHandler_fail_ToS 

If ToS gets rejected/any Scalar error then don't make Jitsi widget
pull/21833/head
Michael Telatynski 2019-10-28 10:05:46 +00:00 committed by GitHub
parent d02d8932e3 8eefb5bf02
commit 89e69ddb0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CallHandler.js
View File

@ -387,7 +387,7 @@ async function _startCallApp(roomId, type) {
// work for us. Better that the user knows before everyone else in the
// room sees it.
const managers = IntegrationManagers.sharedInstance();
let haveScalar = true;
let haveScalar = false;
if (managers.hasManager()) {
try {
const scalarClient = managers.getPrimaryManager().getScalarClient();
@ -396,8 +396,6 @@ async function _startCallApp(roomId, type) {
} catch (e) {
// ignore
}
} else {
haveScalar = false;
}
if (!haveScalar) {