Change Null microphone to Disabled

This commit is contained in:
MSuih 2020-01-03 08:46:00 +02:00 committed by Megamouse
parent f92794360d
commit 69f11d82d1

View file

@ -754,7 +754,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
for (s32 index = 3; index >= 0; index--) for (s32 index = 3; index >= 0; index--)
{ {
if (xemu_settings->m_microphone_creator.sel_list[index] == "" || mics_combo[index]->findText(qstr(xemu_settings->m_microphone_creator.sel_list[index])) == -1) if (xemu_settings->m_microphone_creator.sel_list[index].empty() || mics_combo[index]->findText(qstr(xemu_settings->m_microphone_creator.sel_list[index])) == -1)
{ {
mics_combo[index]->setCurrentText(xemu_settings->m_microphone_creator.mic_none); mics_combo[index]->setCurrentText(xemu_settings->m_microphone_creator.mic_none);
ChangeMicrophoneDevice(index+1, xemu_settings->m_microphone_creator.mic_none); // Ensures the value is set in config ChangeMicrophoneDevice(index+1, xemu_settings->m_microphone_creator.mic_none); // Ensures the value is set in config
@ -764,6 +764,7 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> guiSettings, std:
} }
xemu_settings->EnhanceComboBox(ui->microphoneBox, emu_settings::MicrophoneType); xemu_settings->EnhanceComboBox(ui->microphoneBox, emu_settings::MicrophoneType);
ui->microphoneBox->setItemText(ui->microphoneBox->findData("Null"), tr("Disabled"));
SubscribeTooltip(ui->microphoneBox, json_audio["microphoneBox"].toString()); SubscribeTooltip(ui->microphoneBox, json_audio["microphoneBox"].toString());
connect(ui->microphoneBox, &QComboBox::currentTextChanged, ChangeMicrophoneType); connect(ui->microphoneBox, &QComboBox::currentTextChanged, ChangeMicrophoneType);
PropagateUsedDevices(); // Enables/Disables comboboxes and checks values from config for sanity PropagateUsedDevices(); // Enables/Disables comboboxes and checks values from config for sanity