mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-05 23:26:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1589 from caffeinetv/minor-improvements

Browse Source 
Minor improvements
This commit is contained in:
Jim
2019-04-14 03:43:05 -07:00
committed by GitHub
parent 30e90c3030 54e7267ad9
commit b2bc1e159b
4 changed files with 88 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
UI/window-basic-main.cpp
View File

@@ -4970,6 +4970,9 @@ void OBSBasic::StartStreaming()
}
if (!outputHandler->StartStreaming(service)) {
QString message = !outputHandler->lastError.empty()
? QTStr(outputHandler->lastError.c_str())
: QTStr("Output.StartFailedGeneric");
ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
ui->streamButton->setEnabled(true);
ui->streamButton->setChecked(false);
@@ -4979,9 +4982,8 @@ void OBSBasic::StartStreaming()
sysTrayStream->setEnabled(true);
}
QMessageBox::critical(this,
QTStr("Output.StartStreamFailed"),
QTStr("Output.StartFailedGeneric"));
QMessageBox::critical(this, QTStr("Output.StartStreamFailed"),
message);
return;
}