aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2021-01-13 22:37:37 -0500
committerLioncash <mathew1800@gmail.com>2021-01-13 22:37:40 -0500
commitbdbb35bc3b090ee91aa38f061011d2c6ab4e0777 (patch)
tree30fe845a73cf24eec4a31d788839726d58924e2a
parent15f13ef6057ebbf54875a8909c65f51004b36826 (diff)
configure_motion_touch: Prevent use after move in ApplyConfiguration()
touch_engine was being compared against after being moved into the setter for the engine, so this comparison wouldn't behave properly.
-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 9543f086dd..68110c195c 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();