jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent 09d77878fd
commit 54e7267ad9
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
UI/window-basic-main-outputs.cpp
View File

@ -771,12 +771,15 @@ bool SimpleOutput::StartStreaming(obs_service_t *service)
}
const char *error = obs_output_get_last_error(streamOutput);
bool has_last_error = error && *error;
bool hasLastError = error && *error;
if (hasLastError)
lastError = error;
else
lastError = string();
blog(LOG_WARNING, "Stream output type '%s' failed to start!%s%s",
type,
has_last_error ? " Last Error: " : "",
has_last_error ? error : "");
blog(LOG_WARNING, "Stream output type '%s' failed to start!%s%s", type,
hasLastError ? " Last Error: " : "",
hasLastError ? error : "");
return false;
}
@ -1561,12 +1564,15 @@ bool AdvancedOutput::StartStreaming(obs_service_t *service)
}
const char *error = obs_output_get_last_error(streamOutput);
bool has_last_error = error && *error;
bool hasLastError = error && *error;
if (hasLastError)
lastError = error;
else
lastError = string();
blog(LOG_WARNING, "Stream output type '%s' failed to start!%s%s",
type,
has_last_error ? " Last Error: " : "",
has_last_error ? error : "");
blog(LOG_WARNING, "Stream output type '%s' failed to start!%s%s", type,
hasLastError ? " Last Error: " : "",
hasLastError ? error : "");
return false;
}

1
UI/window-basic-main-outputs.hpp
View File

@ -15,6 +15,7 @@ struct BasicOutputHandler {
OBSBasic *main;
std::string outputType;
std::string lastError;
OBSSignal startRecording;
OBSSignal stopRecording;

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;
}