dahjah/pcsx2
1
0
Fork 0
mirror of https://github.com/PCSX2/pcsx2.git synced 2025-12-16 04:08:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Qt: Don't use wildcard disconnection for some settings combo boxes
Some checks are pending
🐧 Linux Builds / AppImage (push) Waiting to run
Details
🐧 Linux Builds / Flatpak (push) Waiting to run
Details
🍎 MacOS Builds / Defaults (push) Waiting to run
Details
🖥️ Windows Builds / Lint VS Project Files (push) Waiting to run
Details
🖥️ Windows Builds / SSE4 (push) Blocked by required conditions
Details
🖥️ Windows Builds / AVX2 (push) Blocked by required conditions
Details
🖥️ Windows Builds / CMake (push) Waiting to run
Details

Browse Source
This commit is contained in:
chaoticgd 2025-12-12 13:49:37 +00:00 committed by lightningterror
parent 7cc8c7eee6
commit d69c71e058
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcsx2-qt/Settings/AudioSettingsWidget.cpp
View File

@ -180,7 +180,7 @@ void AudioSettingsWidget::updateDriverNames()
const AudioBackend backend = getEffectiveBackend(); const AudioBackend backend = getEffectiveBackend();
const std::vector<std::pair<std::string, std::string>> names = AudioStream::GetDriverNames(backend); const std::vector<std::pair<std::string, std::string>> names = AudioStream::GetDriverNames(backend);
m_ui.driver->disconnect(); QObject::disconnect(m_ui.driver, &QComboBox::currentIndexChanged, nullptr, nullptr);
m_ui.driver->clear(); m_ui.driver->clear();
if (names.empty()) if (names.empty())
{ {
@ -208,7 +208,7 @@ void AudioSettingsWidget::updateDeviceNames()
const std::string current_device = dialog()->getEffectiveStringValue("SPU2/Output", "DeviceName", ""); const std::string current_device = dialog()->getEffectiveStringValue("SPU2/Output", "DeviceName", "");
const std::vector<AudioStream::DeviceInfo> devices = AudioStream::GetOutputDevices(backend, driver_name.c_str()); const std::vector<AudioStream::DeviceInfo> 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_ui.outputDevice->clear();
m_output_device_latency = 0; m_output_device_latency = 0;

6
pcsx2-qt/Settings/GraphicsSettingsWidget.cpp
View File

@ -981,7 +981,7 @@ void GraphicsSettingsWidget::onCaptureContainerChanged()
const std::string container( const std::string container(
dialog()->getEffectiveStringValue("EmuCore/GS", "CaptureContainer", Pcsx2Config::GSOptions::DEFAULT_CAPTURE_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(); m_capture.videoCaptureCodec->clear();
//: This string refers to a default codec, whether it's an audio codec or a video codec. //: This string refers to a default codec, whether it's an audio codec or a video codec.
m_capture.videoCaptureCodec->addItem(tr("Default"), QString()); m_capture.videoCaptureCodec->addItem(tr("Default"), QString());
@ -996,7 +996,7 @@ void GraphicsSettingsWidget::onCaptureContainerChanged()
dialog()->getSettingsInterface(), m_capture.videoCaptureCodec, "EmuCore/GS", "VideoCaptureCodec"); dialog()->getSettingsInterface(), m_capture.videoCaptureCodec, "EmuCore/GS", "VideoCaptureCodec");
connect(m_capture.videoCaptureCodec, &QComboBox::currentIndexChanged, this, &GraphicsSettingsWidget::onCaptureCodecChanged); 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->clear();
m_capture.audioCaptureCodec->addItem(tr("Default"), QString()); m_capture.audioCaptureCodec->addItem(tr("Default"), QString());
for (const auto& [format, name] : GSCapture::GetAudioCodecList(container.c_str())) for (const auto& [format, name] : GSCapture::GetAudioCodecList(container.c_str()))
@ -1012,7 +1012,7 @@ void GraphicsSettingsWidget::onCaptureContainerChanged()
void GraphicsSettingsWidget::GraphicsSettingsWidget::onCaptureCodecChanged() void GraphicsSettingsWidget::GraphicsSettingsWidget::onCaptureCodecChanged()
{ {
m_capture.videoCaptureFormat->disconnect(); QObject::disconnect(m_capture.videoCaptureFormat, &QComboBox::currentIndexChanged, nullptr, nullptr);
m_capture.videoCaptureFormat->clear(); m_capture.videoCaptureFormat->clear();
//: This string refers to a default pixel format //: This string refers to a default pixel format
m_capture.videoCaptureFormat->addItem(tr("Default"), ""); m_capture.videoCaptureFormat->addItem(tr("Default"), "");