From d69c71e058207ab0a6dfc61f963958a61baf4d20 Mon Sep 17 00:00:00 2001 From: chaoticgd <43898262+chaoticgd@users.noreply.github.com> Date: Fri, 12 Dec 2025 13:49:37 +0000 Subject: [PATCH] Qt: Don't use wildcard disconnection for some settings combo boxes --- pcsx2-qt/Settings/AudioSettingsWidget.cpp | 4 ++-- pcsx2-qt/Settings/GraphicsSettingsWidget.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pcsx2-qt/Settings/AudioSettingsWidget.cpp b/pcsx2-qt/Settings/AudioSettingsWidget.cpp index fcfcfb0123..393d473966 100644 --- a/pcsx2-qt/Settings/AudioSettingsWidget.cpp +++ b/pcsx2-qt/Settings/AudioSettingsWidget.cpp @@ -180,7 +180,7 @@ void AudioSettingsWidget::updateDriverNames() const AudioBackend backend = getEffectiveBackend(); const std::vector> names = AudioStream::GetDriverNames(backend); - m_ui.driver->disconnect(); + QObject::disconnect(m_ui.driver, &QComboBox::currentIndexChanged, nullptr, nullptr); m_ui.driver->clear(); if (names.empty()) { @@ -208,7 +208,7 @@ void AudioSettingsWidget::updateDeviceNames() const std::string current_device = dialog()->getEffectiveStringValue("SPU2/Output", "DeviceName", ""); const std::vector devices = AudioStream::GetOutputDevices(backend, driver_name.c_str()); - m_ui.outputDevice->disconnect(); + QObject::disconnect(m_ui.outputDevice, &QComboBox::currentIndexChanged, nullptr, nullptr); m_ui.outputDevice->clear(); m_output_device_latency = 0; diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp index 1f788e6d1f..34a47831ef 100644 --- a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp +++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp @@ -981,7 +981,7 @@ void GraphicsSettingsWidget::onCaptureContainerChanged() const std::string container( dialog()->getEffectiveStringValue("EmuCore/GS", "CaptureContainer", Pcsx2Config::GSOptions::DEFAULT_CAPTURE_CONTAINER)); - m_capture.videoCaptureCodec->disconnect(); + QObject::disconnect(m_capture.videoCaptureCodec, &QComboBox::currentIndexChanged, nullptr, nullptr); m_capture.videoCaptureCodec->clear(); //: This string refers to a default codec, whether it's an audio codec or a video codec. m_capture.videoCaptureCodec->addItem(tr("Default"), QString()); @@ -996,7 +996,7 @@ void GraphicsSettingsWidget::onCaptureContainerChanged() dialog()->getSettingsInterface(), m_capture.videoCaptureCodec, "EmuCore/GS", "VideoCaptureCodec"); connect(m_capture.videoCaptureCodec, &QComboBox::currentIndexChanged, this, &GraphicsSettingsWidget::onCaptureCodecChanged); - m_capture.audioCaptureCodec->disconnect(); + QObject::disconnect(m_capture.audioCaptureCodec, &QComboBox::currentIndexChanged, nullptr, nullptr); m_capture.audioCaptureCodec->clear(); m_capture.audioCaptureCodec->addItem(tr("Default"), QString()); for (const auto& [format, name] : GSCapture::GetAudioCodecList(container.c_str())) @@ -1012,7 +1012,7 @@ void GraphicsSettingsWidget::onCaptureContainerChanged() void GraphicsSettingsWidget::GraphicsSettingsWidget::onCaptureCodecChanged() { - m_capture.videoCaptureFormat->disconnect(); + QObject::disconnect(m_capture.videoCaptureFormat, &QComboBox::currentIndexChanged, nullptr, nullptr); m_capture.videoCaptureFormat->clear(); //: This string refers to a default pixel format m_capture.videoCaptureFormat->addItem(tr("Default"), "");