Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

configure_motion_touch: Prevent use after move in ApplyConfiguration()

Browse source 
touch_engine was being compared against after being moved into the
setter for the engine, so this comparison wouldn't behave properly.
This commit is contained in:
Lioncash 2021-01-13 22:37:37 -05:00
parent 5e35c69f35
commit 45aee996c1
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/yuzu/configuration/configure_motion_touch.cpp
View file

@ -328,14 +328,13 @@ void ConfigureMotionTouch::ApplyConfiguration() {
std::string touch_engine = ui->touch_provider->currentData().toString().toStdString(); std::string touch_engine = ui->touch_provider->currentData().toString().toStdString();
Common::ParamPackage touch_param{}; Common::ParamPackage touch_param{};
touch_param.Set("engine", std::move(touch_engine));
if (touch_engine == "cemuhookudp") { if (touch_engine == "cemuhookudp") {
touch_param.Set("min_x", min_x); touch_param.Set("min_x", min_x);
touch_param.Set("min_y", min_y); touch_param.Set("min_y", min_y);
touch_param.Set("max_x", max_x); touch_param.Set("max_x", max_x);
touch_param.Set("max_y", max_y); touch_param.Set("max_y", max_y);
} }
touch_param.Set("engine", std::move(touch_engine));
Settings::values.touch_device = touch_param.Serialize(); Settings::values.touch_device = touch_param.Serialize();
Settings::values.use_touch_from_button = ui->touch_from_button_checkbox->isChecked(); Settings::values.use_touch_from_button = ui->touch_from_button_checkbox->isChecked();