drifty/emulator
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emulator synced 2025-12-28 14:23:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'collecting-main-patch-23223' into 'main'

Browse Source 
std::vector::at() crash fix

See merge request citron/emulator!35
This commit is contained in:
Zephyron
2025-09-24 15:53:24 +10:00
parent af223e445f 6bfe70c1bc
commit bb87388ba9
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/citron/configuration/shared_widget.cpp
View File

@@ -1,4 +1,5 @@
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-FileCopyrightText: Copyright 2025 citron Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include "citron/configuration/shared_widget.h"
@@ -152,7 +153,15 @@ QWidget* Widget::CreateCombobox(std::function<std::string()>& serializer,
};
const u32 setting_value = std::strtoul(setting.ToString().c_str(), nullptr, 0);
combobox->setCurrentIndex(find_index(setting_value));
const int index = find_index(setting_value);
if (index != -1) {
combobox->setCurrentIndex(index);
} else {
LOG_WARNING(Frontend, "Could not find current setting for combobox '{}'. Defaulting to first item.", setting.GetLabel());
// If not found, safely select the first item in the list instead of an invalid one.
combobox->setCurrentIndex(0);
}
serializer = [this, enumeration]() {
int current = combobox->currentIndex();