From 937356cc8aabae18e4bb9f3f761a249e09759d5f Mon Sep 17 00:00:00 2001 From: fryshorts Date: Sat, 6 May 2017 15:59:41 +0200 Subject: [PATCH] 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. --- UI/window-basic-settings.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index 6153dbd43..8c27939ce 100644 --- a/UI/window-basic-settings.cpp +++ b/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;