From 7217671eb0812681a9f83858bb02065b671673e7 Mon Sep 17 00:00:00 2001 From: Richard Stanway Date: Thu, 12 Aug 2021 23:41:14 +0200 Subject: [PATCH] UI: Trim custom server string Spaces in the URL can cause issues as ffmpeg-mux is unable to figure out the protocol. Fixes #5100. --- UI/window-basic-auto-config.cpp | 4 ++-- UI/window-basic-settings-stream.cpp | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/UI/window-basic-auto-config.cpp b/UI/window-basic-auto-config.cpp index 15ddde07a..95beaf3a1 100644 --- a/UI/window-basic-auto-config.cpp +++ b/UI/window-basic-auto-config.cpp @@ -369,7 +369,7 @@ bool AutoConfigStreamPage::validatePage() obs_service_apply_encoder_settings(service, settings, nullptr); if (wiz->customServer) { - QString server = ui->customServer->text(); + QString server = ui->customServer->text().trimmed(); wiz->server = wiz->serverName = QT_TO_UTF8(server); } else { wiz->serverName = QT_TO_UTF8(ui->server->currentText()); @@ -693,7 +693,7 @@ void AutoConfigStreamPage::UpdateMoreInfoLink() void AutoConfigStreamPage::UpdateKeyLink() { QString serviceName = ui->service->currentText(); - QString customServer = ui->customServer->text(); + QString customServer = ui->customServer->text().trimmed(); bool isYoutube = false; QString streamKeyLink; diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp index 44db7e9c2..57a854be3 100644 --- a/UI/window-basic-settings-stream.cpp +++ b/UI/window-basic-settings-stream.cpp @@ -198,8 +198,9 @@ void OBSBasicSettings::SaveStream1Settings() settings, "server", QT_TO_UTF8(ui->server->currentData().toString())); } else { - obs_data_set_string(settings, "server", - QT_TO_UTF8(ui->customServer->text())); + obs_data_set_string( + settings, "server", + QT_TO_UTF8(ui->customServer->text().trimmed())); obs_data_set_bool(settings, "use_auth", ui->useAuth->isChecked()); if (ui->useAuth->isChecked()) { @@ -280,7 +281,7 @@ void OBSBasicSettings::UpdateMoreInfoLink() void OBSBasicSettings::UpdateKeyLink() { QString serviceName = ui->service->currentText(); - QString customServer = ui->customServer->text(); + QString customServer = ui->customServer->text().trimmed(); QString streamKeyLink; if (serviceName == "Twitch") { streamKeyLink = "https://dashboard.twitch.tv/settings/stream"; @@ -577,8 +578,9 @@ OBSService OBSBasicSettings::SpawnTempService() settings, "server", QT_TO_UTF8(ui->server->currentData().toString())); } else { - obs_data_set_string(settings, "server", - QT_TO_UTF8(ui->customServer->text())); + obs_data_set_string( + settings, "server", + QT_TO_UTF8(ui->customServer->text().trimmed())); } obs_data_set_string(settings, "key", QT_TO_UTF8(ui->key->text()));