From 8a8019db3f287db6b11db545d61108f5383d2b98 Mon Sep 17 00:00:00 2001 From: Ruwen Hahn Date: Fri, 7 Jun 2024 17:31:25 +0200 Subject: [PATCH] UI: Only cache multitrack config URL startup argument --- UI/goliveapi-network.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/UI/goliveapi-network.cpp b/UI/goliveapi-network.cpp index 34b751eb4..fb7871082 100644 --- a/UI/goliveapi-network.cpp +++ b/UI/goliveapi-network.cpp @@ -128,7 +128,8 @@ GoLiveApi::Config DownloadGoLiveConfig(QWidget *parent, QString url, QString MultitrackVideoAutoConfigURL(obs_service_t *service) { - static const QString url = [service]() -> QString { + static const std::optional cli_url = + []() -> std::optional { auto args = qApp->arguments(); for (int i = 0; i < args.length() - 1; i++) { if (args[i] == "--config-url" && @@ -136,11 +137,18 @@ QString MultitrackVideoAutoConfigURL(obs_service_t *service) return args[i + 1]; } } - OBSDataAutoRelease settings = obs_service_get_settings(service); - return obs_data_get_string( - settings, "multitrack_video_configuration_url"); + return std::nullopt; }(); + QString url; + if (cli_url.has_value()) { + url = *cli_url; + } else { + OBSDataAutoRelease settings = obs_service_get_settings(service); + url = obs_data_get_string(settings, + "multitrack_video_configuration_url"); + } + blog(LOG_INFO, "Go live URL: %s", url.toUtf8().constData()); return url; }