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

This commit is contained in:
Šimon Brandner 2023-07-07 18:18:58 +02:00 committed by GitHub
commit 3c560ed126
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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