summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Morph2021-01-14 15:24:03 +0800
committerGravatar GitHub2021-01-14 15:24:03 +0800
commit980973d83ece14861f56b88a9acc407029a30a36 (patch)
tree30fe845a73cf24eec4a31d788839726d58924e2a
parentMerge pull request #5330 from german77/regexerror (diff)
parentconfigure_motion_touch: Prevent use after move in ApplyConfiguration() (diff)
downloadyuzu-980973d83ece14861f56b88a9acc407029a30a36.tar.gz
yuzu-980973d83ece14861f56b88a9acc407029a30a36.tar.xz
yuzu-980973d83ece14861f56b88a9acc407029a30a36.zip
Merge pull request #5344 from lioncash/move
configure_motion_touch: Prevent use after move in ApplyConfiguration()
-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() {
328 std::string touch_engine = ui->touch_provider->currentData().toString().toStdString(); 328 std::string touch_engine = ui->touch_provider->currentData().toString().toStdString();
329 329
330 Common::ParamPackage touch_param{}; 330 Common::ParamPackage touch_param{};
331 touch_param.Set("engine", std::move(touch_engine));
332
333 if (touch_engine == "cemuhookudp") { 331 if (touch_engine == "cemuhookudp") {
334 touch_param.Set("min_x", min_x); 332 touch_param.Set("min_x", min_x);
335 touch_param.Set("min_y", min_y); 333 touch_param.Set("min_y", min_y);
336 touch_param.Set("max_x", max_x); 334 touch_param.Set("max_x", max_x);
337 touch_param.Set("max_y", max_y); 335 touch_param.Set("max_y", max_y);
338 } 336 }
337 touch_param.Set("engine", std::move(touch_engine));
339 338
340 Settings::values.touch_device = touch_param.Serialize(); 339 Settings::values.touch_device = touch_param.Serialize();
341 Settings::values.use_touch_from_button = ui->touch_from_button_checkbox->isChecked(); 340 Settings::values.use_touch_from_button = ui->touch_from_button_checkbox->isChecked();