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

Merge pull request #3451 from kkartaltepe/fix-upload-logs-linux

Browse Source 
UI:Fix crash on log upload
This commit is contained in:
Jim 2020-09-13 16:18:00 -07:00 committed by GitHub
commit 32bb14ddea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5279,7 +5279,9 @@ void OBSBasic::UploadLog(const char *subdir, const char *file, const bool crash)
return;
ui->menuLogFiles->setEnabled(false);
#if defined(_WIN32) || defined(__APPLE__)
ui->menuCrashLogs->setEnabled(false);
#endif
stringstream ss;
ss << "OBS " << App()->GetVersionString() << " log file uploaded at "
@ -5361,7 +5363,9 @@ void OBSBasic::on_actionCheckForUpdates_triggered()
void OBSBasic::logUploadFinished(const QString &text, const QString &error)
{
ui->menuLogFiles->setEnabled(true);
#if defined(_WIN32) || defined(__APPLE__)
ui->menuCrashLogs->setEnabled(true);
#endif
if (text.isEmpty()) {
OBSMessageBox::critical(
@ -5375,7 +5379,9 @@ void OBSBasic::logUploadFinished(const QString &text, const QString &error)
void OBSBasic::crashUploadFinished(const QString &text, const QString &error)
{
ui->menuLogFiles->setEnabled(true);
#if defined(_WIN32) || defined(__APPLE__)
ui->menuCrashLogs->setEnabled(true);
#endif
if (text.isEmpty()) {
OBSMessageBox::critical(