summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-01-14 08:24:03 +0100
committerGitHub <noreply@github.com>2021-01-14 08:24:03 +0100
commit980973d83ece14861f56b88a9acc407029a30a36 (patch)
tree30fe845a73cf24eec4a31d788839726d58924e2a
parentMerge pull request #5330 from german77/regexerror (diff)
parentconfigure_motion_touch: Prevent use after move in ApplyConfiguration() (diff)
downloadyuzu-980973d83ece14861f56b88a9acc407029a30a36.tar
yuzu-980973d83ece14861f56b88a9acc407029a30a36.tar.gz
yuzu-980973d83ece14861f56b88a9acc407029a30a36.tar.bz2
yuzu-980973d83ece14861f56b88a9acc407029a30a36.tar.lz
yuzu-980973d83ece14861f56b88a9acc407029a30a36.tar.xz
yuzu-980973d83ece14861f56b88a9acc407029a30a36.tar.zst
yuzu-980973d83ece14861f56b88a9acc407029a30a36.zip
-rw-r--r--src/yuzu/configuration/configure_motion_touch.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/yuzu/configuration/configure_motion_touch.cpp b/src/yuzu/configuration/configure_motion_touch.cpp
index 9543f086d..68110c195 100644
--- a/src/yuzu/configuration/configure_motion_touch.cpp
+++ b/src/yuzu/configuration/configure_motion_touch.cpp
@@ -328,14 +328,13 @@ void ConfigureMotionTouch::ApplyConfiguration() {
std::string touch_engine = ui->touch_provider->currentData().toString().toStdString();
Common::ParamPackage touch_param{};
- touch_param.Set("engine", std::move(touch_engine));
-
if (touch_engine == "cemuhookudp") {
touch_param.Set("min_x", min_x);
touch_param.Set("min_y", min_y);
touch_param.Set("max_x", max_x);
touch_param.Set("max_y", max_y);
}
+ touch_param.Set("engine", std::move(touch_engine));
Settings::values.touch_device = touch_param.Serialize();
Settings::values.use_touch_from_button = ui->touch_from_button_checkbox->isChecked();