From 74f96615569b0fb957e557026ba3fc2c797c356b Mon Sep 17 00:00:00 2001 From: Kurt Kartaltepe Date: Thu, 10 Sep 2020 18:20:07 -0700 Subject: [PATCH] UI:Fix crash on log upload Earlier code calls enable on platform specific UI elements resulting in crash since these elements are deleted on Linux. --- UI/window-basic-main.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index c85ef15a9..619197805 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -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(