summaryrefslogtreecommitdiff
path: root/src/yuzu/configuration
diff options
context:
space:
mode:
Diffstat (limited to 'src/yuzu/configuration')
-rw-r--r--src/yuzu/configuration/configure_general.ui2
-rw-r--r--src/yuzu/configuration/configure_input.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui
index 6cd79673c..add110bb0 100644
--- a/src/yuzu/configuration/configure_general.ui
+++ b/src/yuzu/configuration/configure_general.ui
@@ -64,7 +64,7 @@
<item>
<widget class="QCheckBox" name="use_extended_memory_layout">
<property name="text">
- <string>Extended memory layout (6GB DRAM)</string>
+ <string>Extended memory layout (8GB DRAM)</string>
</property>
</widget>
</item>
diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp
index 1db374d4a..7fce85bca 100644
--- a/src/yuzu/configuration/configure_input.cpp
+++ b/src/yuzu/configuration/configure_input.cpp
@@ -189,6 +189,8 @@ QList<QWidget*> ConfigureInput::GetSubTabs() const {
}
void ConfigureInput::ApplyConfiguration() {
+ const bool was_global = Settings::values.players.UsingGlobal();
+ Settings::values.players.SetGlobal(true);
for (auto* controller : player_controllers) {
controller->ApplyConfiguration();
}
@@ -201,6 +203,7 @@ void ConfigureInput::ApplyConfiguration() {
Settings::values.vibration_enabled.SetValue(ui->vibrationGroup->isChecked());
Settings::values.motion_enabled.SetValue(ui->motionGroup->isChecked());
+ Settings::values.players.SetGlobal(was_global);
}
void ConfigureInput::changeEvent(QEvent* event) {