Преглед изворни кода

UI: fix unable to upload and view crash report in mac

Mike So пре 5 година
родитељ
комит
f79393a727
1 измењених фајлова са 10 додато и 6 уклоњено
  1. 10 6
      UI/window-basic-main.cpp

+ 10 - 6
UI/window-basic-main.cpp

@@ -1955,16 +1955,20 @@ void OBSBasic::OBSInit()
 
 	ui->sources->UpdateIcons();
 
-#if !defined(_WIN32) && !defined(__APPLE__)
+#if !defined(_WIN32)
 	delete ui->actionShowCrashLogs;
 	delete ui->actionUploadLastCrashLog;
 	delete ui->menuCrashLogs;
-	delete ui->actionCheckForUpdates;
 	ui->actionShowCrashLogs = nullptr;
 	ui->actionUploadLastCrashLog = nullptr;
 	ui->menuCrashLogs = nullptr;
+#if !defined(__APPLE__)
+	delete ui->actionCheckForUpdates;
 	ui->actionCheckForUpdates = nullptr;
-#elif _WIN32 || __APPLE__
+#endif
+#endif
+
+#if defined(_WIN32) || defined(__APPLE__)
 	if (App()->IsUpdaterDisabled())
 		ui->actionCheckForUpdates->setEnabled(false);
 #endif
@@ -5343,7 +5347,7 @@ void OBSBasic::UploadLog(const char *subdir, const char *file, const bool crash)
 		return;
 
 	ui->menuLogFiles->setEnabled(false);
-#if defined(_WIN32) || defined(__APPLE__)
+#if defined(_WIN32)
 	ui->menuCrashLogs->setEnabled(false);
 #endif
 
@@ -5430,7 +5434,7 @@ void OBSBasic::on_actionCheckForUpdates_triggered()
 void OBSBasic::logUploadFinished(const QString &text, const QString &error)
 {
 	ui->menuLogFiles->setEnabled(true);
-#if defined(_WIN32) || defined(__APPLE__)
+#if defined(_WIN32)
 	ui->menuCrashLogs->setEnabled(true);
 #endif
 
@@ -5446,7 +5450,7 @@ 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__)
+#if defined(_WIN32)
 	ui->menuCrashLogs->setEnabled(true);
 #endif