rzerres/element-call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1209 from vector-im/SimonBrandner/feat/lk-url-fallback

Browse Source
This commit is contained in:
Šimon Brandner
2023-07-07 18:18:58 +02:00
committed by GitHub
parent 5c5aa27a20 124c6223e4
commit 3c560ed126
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/room/GroupCallView.tsx
View File

@@ -36,6 +36,7 @@ import { UserChoices } from "../livekit/useLiveKit";
import { findDeviceByName } from "../media-utils"; import { findDeviceByName } from "../media-utils";
import { OpenIDLoader } from "../livekit/OpenIDLoader"; import { OpenIDLoader } from "../livekit/OpenIDLoader";
import { ActiveCall } from "./InCallView"; import { ActiveCall } from "./InCallView";
import { Config } from "../config/Config";
declare global { declare global {
interface Window { interface Window {
@@ -219,7 +220,9 @@ export function GroupCallView({
undefined undefined
); );
const livekitServiceURL = groupCall.foci[0]?.livekitServiceUrl; const livekitServiceURL =
groupCall.foci[0]?.livekitServiceUrl ??
Config.get().livekit.livekit_service_url;
if (!livekitServiceURL) { if (!livekitServiceURL) {
return <ErrorView error={new Error("No livekit_service_url defined")} />; return <ErrorView error={new Error("No livekit_service_url defined")} />;
} }