dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-06-07 10:14:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Hotfix: fix creating new game config and loading experimental tab (#3600)
Some checks failed
Build and Release / reuse (push) Has been cancelled
Details
Build and Release / clang-format (push) Has been cancelled
Details
Build and Release / get-info (push) Has been cancelled
Details
Build and Release / windows-sdl (push) Has been cancelled
Details
Build and Release / windows-qt (push) Has been cancelled
Details
Build and Release / macos-sdl (push) Has been cancelled
Details
Build and Release / macos-qt (push) Has been cancelled
Details
Build and Release / linux-sdl (push) Has been cancelled
Details
Build and Release / linux-qt (push) Has been cancelled
Details
Build and Release / linux-sdl-gcc (push) Has been cancelled
Details
Build and Release / linux-qt-gcc (push) Has been cancelled
Details
Build and Release / pre-release (push) Has been cancelled
Details

Browse Source
This commit is contained in:
rainmakerv2 2025-09-14 21:31:29 +08:00 committed by GitHub
parent fb090dc90f
commit c106a98bd6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/config.cpp
View File

@ -100,12 +100,6 @@ public:
void setTomlValue(toml::ordered_value& data, const std::string& header, const std::string& key, void setTomlValue(toml::ordered_value& data, const std::string& header, const std::string& key,
bool is_game_specific = false) { bool is_game_specific = false) {
if (is_game_specific) { if (is_game_specific) {
if (game_specific_value == std::nullopt) {
fmt::print("Attempted to save std::nullopt value to {}-{}, matching config entry "
"may not be correctly set-up\n",
header, key);
return;
}
data[header][key] = game_specific_value.value_or(base_value); data[header][key] = game_specific_value.value_or(base_value);
game_specific_value = std::nullopt; game_specific_value = std::nullopt;
} else { } else {

5
src/qt_gui/settings_dialog.cpp
View File

@ -736,8 +736,9 @@ void SettingsDialog::LoadValuesFromConfig() {
} }
ui->chooseHomeTabComboBox->setCurrentText(translatedText); ui->chooseHomeTabComboBox->setCurrentText(translatedText);
QStringList tabNames = {tr("General"), tr("GUI"), tr("Graphics"), tr("User"), QStringList tabNames = {tr("General"), tr("GUI"), tr("Graphics"),
tr("Input"), tr("Paths"), tr("Log"), tr("Debug")}; tr("User"), tr("Input"), tr("Paths"),
tr("Log"), tr("Debug"), tr("Experimental")};
int indexTab = tabNames.indexOf(translatedText); int indexTab = tabNames.indexOf(translatedText);
if (indexTab == -1 || !ui->tabWidgetSettings->isTabVisible(indexTab) || is_newly_created) if (indexTab == -1 || !ui->tabWidgetSettings->isTabVisible(indexTab) || is_newly_created)
indexTab = 0; indexTab = 0;