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

Merge pull request #1219 from cg2121/linux-delete-checkforupdates

UI: Remove check for updates on Linux
Jim пре 7 година
родитељ
комит
89c81933d4
2 измењених фајлова са 10 додато и 2 уклоњено
  1. 5 0
      UI/window-basic-main.cpp
  2. 5 2
      UI/window-basic-settings.cpp

+ 5 - 0
UI/window-basic-main.cpp

@@ -1653,6 +1653,11 @@ void OBSBasic::OBSInit()
 			&OBSBasic::UpdateMultiviewProjectorMenu);
 	ui->viewMenu->addAction(QTStr("MultiviewWindowed"),
 			this, SLOT(OpenMultiviewWindow()));
+
+#if !defined(_WIN32) && !defined(__APPLE__)
+	delete ui->actionCheckForUpdates;
+	ui->actionCheckForUpdates = nullptr;
+#endif
 }
 
 void OBSBasic::UpdateMultiviewProjectorMenu()

+ 5 - 2
UI/window-basic-settings.cpp

@@ -442,10 +442,13 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
 	HookWidget(ui->enableNewSocketLoop,  CHECK_CHANGED,  ADV_CHANGED);
 	HookWidget(ui->enableLowLatencyMode, CHECK_CHANGED,  ADV_CHANGED);
 
-#if !defined(_WIN32) && !defined(__APPLE__) && !HAVE_PULSEAUDIO
+#if !defined(_WIN32) && !defined(__APPLE__)
 	delete ui->enableAutoUpdates;
-	delete ui->advAudioGroupBox;
 	ui->enableAutoUpdates = nullptr;
+#endif
+
+#if !defined(_WIN32) && !defined(__APPLE__) && !HAVE_PULSEAUDIO
+	delete ui->advAudioGroupBox;
 	ui->advAudioGroupBox = nullptr;
 #endif