franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config(qt): Sanitize docked handheld controller

Browse Source
This commit is contained in:
lat9nq 2023-08-21 16:33:56 -04:00
parent 6ed5b581f0
commit 7f8335f4ae
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/yuzu/configuration/configure_per_game.cpp
View File

@ -18,6 +18,7 @@
#include "common/fs/fs_util.h" #include "common/fs/fs_util.h"
#include "common/settings_enums.h" #include "common/settings_enums.h"
#include "common/settings_input.h"
#include "configuration/shared_widget.h" #include "configuration/shared_widget.h"
#include "core/core.h" #include "core/core.h"
#include "core/file_sys/control_metadata.h" #include "core/file_sys/control_metadata.h"
@ -98,6 +99,13 @@ void ConfigurePerGame::ApplyConfiguration() {
addons_tab->ApplyConfiguration(); addons_tab->ApplyConfiguration();
input_tab->ApplyConfiguration(); input_tab->ApplyConfiguration();
if (Settings::values.use_docked_mode.GetValue() == Settings::ConsoleMode::Docked &&
Settings::values.players.GetValue()[0].controller_type ==
Settings::ControllerType::Handheld) {
Settings::values.use_docked_mode.SetValue(Settings::ConsoleMode::Handheld);
Settings::values.use_docked_mode.SetGlobal(true);
}
system.ApplySettings(); system.ApplySettings();
Settings::LogSettings(); Settings::LogSettings();

5
src/yuzu/configuration/configure_system.cpp
View File

@ -106,6 +106,11 @@ void ConfigureSystem::Setup(const ConfigurationShared::Builder& builder) {
push(Settings::values.linkage.by_category[Settings::Category::System]); push(Settings::values.linkage.by_category[Settings::Category::System]);
for (auto setting : settings) { for (auto setting : settings) {
if (setting->Id() == Settings::values.use_docked_mode.Id() &&
Settings::IsConfiguringGlobal()) {
continue;
}
ConfigurationShared::Widget* widget = builder.BuildWidget(setting, apply_funcs); ConfigurationShared::Widget* widget = builder.BuildWidget(setting, apply_funcs);
if (widget == nullptr) { if (widget == nullptr) {