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

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
commit b2bc1e159b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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;
}