4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Show output's last error in failure dialog

Browse source 
Logs the last output error if given.
This commit is contained in:
Matthew Orlando 2018-12-12 15:20:48 -08:00 • committed by Andersama
commit 54e7267ad9
3 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4762,6 +4762,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);
@ -4771,9 +4774,8 @@ void OBSBasic::StartStreaming()
sysTrayStream->setEnabled(true);
}
QMessageBox::critical(this,
QTStr("Output.StartStreamFailed"),
QTStr("Output.StartFailedGeneric"));
QMessageBox::critical(this, QTStr("Output.StartStreamFailed"),
message);
return;
}