From 7f8335f4ae4c87764faf91c1d866bded95d1e6ad Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Mon, 21 Aug 2023 16:33:56 -0400
Subject: config(qt): Sanitize docked handheld controller

---
 src/yuzu/configuration/configure_per_game.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/yuzu/configuration/configure_per_game.cpp')

diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp
index 4f9e8db08..e371f902e 100644
--- a/src/yuzu/configuration/configure_per_game.cpp
+++ b/src/yuzu/configuration/configure_per_game.cpp
@@ -18,6 +18,7 @@
 
 #include "common/fs/fs_util.h"
 #include "common/settings_enums.h"
+#include "common/settings_input.h"
 #include "configuration/shared_widget.h"
 #include "core/core.h"
 #include "core/file_sys/control_metadata.h"
@@ -98,6 +99,13 @@ void ConfigurePerGame::ApplyConfiguration() {
     addons_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();
     Settings::LogSettings();
 
-- 
cgit v1.2.3


From 3c45452fae7f33d0534c144c5f588ef98f0a1346 Mon Sep 17 00:00:00 2001
From: lat9nq <22451773+lat9nq@users.noreply.github.com>
Date: Tue, 22 Aug 2023 21:58:23 -0400
Subject: general: Use console mode helper across project

---
 src/yuzu/configuration/configure_per_game.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/yuzu/configuration/configure_per_game.cpp')

diff --git a/src/yuzu/configuration/configure_per_game.cpp b/src/yuzu/configuration/configure_per_game.cpp
index e371f902e..b91d6ad4a 100644
--- a/src/yuzu/configuration/configure_per_game.cpp
+++ b/src/yuzu/configuration/configure_per_game.cpp
@@ -99,9 +99,8 @@ void ConfigurePerGame::ApplyConfiguration() {
     addons_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) {
+    if (Settings::IsDockedMode() && 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);
     }
-- 
cgit v1.2.3