Просмотр исходного кода

UI: Fix settings dialog crashing on linux

Fix a double free in the settings window that occurs on linux only.
The UI Element already gets deleted above as a child of the
advAudioGroupBox which is not present on linux.
Apart from making the code even more unreadable, this will likely
come back to haunt us if the advAudioGroup will ever be shown on linux.
fryshorts 8 лет назад
Родитель
Сommit
937356cc8a
1 измененных файлов с 4 добавлено и 0 удалено
  1. 4 0
      UI/window-basic-settings.cpp

+ 4 - 0
UI/window-basic-settings.cpp

@@ -464,7 +464,9 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
 	delete ui->advancedGeneralGroupBox;
 	delete ui->enableNewSocketLoop;
 	delete ui->enableLowLatencyMode;
+#ifdef __APPLE__
 	delete ui->disableAudioDucking;
+#endif
 	ui->rendererLabel = nullptr;
 	ui->renderer = nullptr;
 	ui->adapterLabel = nullptr;
@@ -474,8 +476,10 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent)
 	ui->advancedGeneralGroupBox = nullptr;
 	ui->enableNewSocketLoop = nullptr;
 	ui->enableLowLatencyMode = nullptr;
+#ifdef __APPLE__
 	ui->disableAudioDucking = nullptr;
 #endif
+#endif
 
 #ifndef __APPLE__
 	delete ui->disableOSXVSync;