mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00
Code

UI: Trim custom server string

Browse Source 
Spaces in the URL can cause issues as ffmpeg-mux is unable to figure
out the protocol. Fixes #5100.
This commit is contained in:
Richard Stanway 2021-08-12 23:41:14 +02:00
parent 5b18faeb49
commit 7217671eb0
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UI/window-basic-auto-config.cpp
View File

@ -369,7 +369,7 @@ bool AutoConfigStreamPage::validatePage()
obs_service_apply_encoder_settings(service, settings, nullptr); obs_service_apply_encoder_settings(service, settings, nullptr);
if (wiz->customServer) { if (wiz->customServer) {
QString server = ui->customServer->text(); QString server = ui->customServer->text().trimmed();
wiz->server = wiz->serverName = QT_TO_UTF8(server); wiz->server = wiz->serverName = QT_TO_UTF8(server);
} else { } else {
wiz->serverName = QT_TO_UTF8(ui->server->currentText()); wiz->serverName = QT_TO_UTF8(ui->server->currentText());
@ -693,7 +693,7 @@ void AutoConfigStreamPage::UpdateMoreInfoLink()
void AutoConfigStreamPage::UpdateKeyLink() void AutoConfigStreamPage::UpdateKeyLink()
{ {
QString serviceName = ui->service->currentText(); QString serviceName = ui->service->currentText();
QString customServer = ui->customServer->text(); QString customServer = ui->customServer->text().trimmed();
bool isYoutube = false; bool isYoutube = false;
QString streamKeyLink; QString streamKeyLink;

12
UI/window-basic-settings-stream.cpp
View File

@ -198,8 +198,9 @@ void OBSBasicSettings::SaveStream1Settings()
settings, "server", settings, "server",
QT_TO_UTF8(ui->server->currentData().toString())); QT_TO_UTF8(ui->server->currentData().toString()));
} else { } else {
obs_data_set_string(settings, "server", obs_data_set_string(
QT_TO_UTF8(ui->customServer->text())); settings, "server",
QT_TO_UTF8(ui->customServer->text().trimmed()));
obs_data_set_bool(settings, "use_auth", obs_data_set_bool(settings, "use_auth",
ui->useAuth->isChecked()); ui->useAuth->isChecked());
if (ui->useAuth->isChecked()) { if (ui->useAuth->isChecked()) {
@ -280,7 +281,7 @@ void OBSBasicSettings::UpdateMoreInfoLink()
void OBSBasicSettings::UpdateKeyLink() void OBSBasicSettings::UpdateKeyLink()
{ {
QString serviceName = ui->service->currentText(); QString serviceName = ui->service->currentText();
QString customServer = ui->customServer->text(); QString customServer = ui->customServer->text().trimmed();
QString streamKeyLink; QString streamKeyLink;
if (serviceName == "Twitch") { if (serviceName == "Twitch") {
streamKeyLink = "https://dashboard.twitch.tv/settings/stream"; streamKeyLink = "https://dashboard.twitch.tv/settings/stream";
@ -577,8 +578,9 @@ OBSService OBSBasicSettings::SpawnTempService()
settings, "server", settings, "server",
QT_TO_UTF8(ui->server->currentData().toString())); QT_TO_UTF8(ui->server->currentData().toString()));
} else { } else {
obs_data_set_string(settings, "server", obs_data_set_string(
QT_TO_UTF8(ui->customServer->text())); settings, "server",
QT_TO_UTF8(ui->customServer->text().trimmed()));
} }
obs_data_set_string(settings, "key", QT_TO_UTF8(ui->key->text())); obs_data_set_string(settings, "key", QT_TO_UTF8(ui->key->text()));