summaryrefslogtreecommitdiff
path: root/src/common/settings.cpp
diff options
context:
space:
mode:
authorGravatar liamwhite2023-10-14 09:58:03 -0400
committerGravatar GitHub2023-10-14 09:58:03 -0400
commit18672e6a78c4df3bdd7e1728c484beb88cdc7a22 (patch)
tree3aac6f5410aab34818a55142d74f03ed17470e2d /src/common/settings.cpp
parentMerge pull request #11772 from v1993/polyfill-thread-fixes (diff)
parentfix style (diff)
downloadyuzu-18672e6a78c4df3bdd7e1728c484beb88cdc7a22.tar.gz
yuzu-18672e6a78c4df3bdd7e1728c484beb88cdc7a22.tar.xz
yuzu-18672e6a78c4df3bdd7e1728c484beb88cdc7a22.zip
Merge pull request #11159 from flodavid/master_bis
Enable to use controller to close a game
Diffstat (limited to 'src/common/settings.cpp')
-rw-r--r--src/common/settings.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 3fde3cae6..98b43e49c 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -45,6 +45,7 @@ SWITCHABLE(CpuAccuracy, true);
45SWITCHABLE(FullscreenMode, true); 45SWITCHABLE(FullscreenMode, true);
46SWITCHABLE(GpuAccuracy, true); 46SWITCHABLE(GpuAccuracy, true);
47SWITCHABLE(Language, true); 47SWITCHABLE(Language, true);
48SWITCHABLE(MemoryLayout, true);
48SWITCHABLE(NvdecEmulation, false); 49SWITCHABLE(NvdecEmulation, false);
49SWITCHABLE(Region, true); 50SWITCHABLE(Region, true);
50SWITCHABLE(RendererBackend, true); 51SWITCHABLE(RendererBackend, true);
@@ -61,6 +62,10 @@ SWITCHABLE(u32, false);
61SWITCHABLE(u8, false); 62SWITCHABLE(u8, false);
62SWITCHABLE(u8, true); 63SWITCHABLE(u8, true);
63 64
65// Used in UISettings
66// TODO see if we can move this to uisettings.cpp
67SWITCHABLE(ConfirmStop, true);
68
64#undef SETTING 69#undef SETTING
65#undef SWITCHABLE 70#undef SWITCHABLE
66#endif 71#endif