4 files changed, 37 insertions, 41 deletions

diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index a0dfa06df..27b67fd9e 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -567,8 +567,10 @@ void Config::ReadControlValues() {
     Settings::values.mouse_panning = false;
     ReadBasicSetting(Settings::values.mouse_panning_sensitivity);
 
-    ReadBasicSetting(Settings::values.tas_enable = false);
-    ReadBasicSetting(Settings::values.tas_reset = false);
+    ReadBasicSetting(Settings::values.tas_enable);
+    ReadBasicSetting(Settings::values.tas_loop);
+    ReadBasicSetting(Settings::values.tas_swap_controllers);
+    ReadBasicSetting(Settings::values.pause_tas_on_load);
 
     ReadGlobalSetting(Settings::values.use_docked_mode);
 
@@ -667,20 +669,16 @@ void Config::ReadDataStorageValues() {
                     QString::fromStdString(FS::GetYuzuPathString(FS::YuzuPath::DumpDir)))
             .toString()
             .toStdString());
-    FS::SetYuzuPath(
-        FS::YuzuPath::TASFile,
-        qt_config
-        ->value(QStringLiteral("tas_path"),
-            QString::fromStdString(FS::GetYuzuPathString(FS::YuzuPath::TASFile)))
-        .toString()
-        .toStdString());
-
-    ReadBasicSetting(Settings::values.pauseTasOnLoad);
+    FS::SetYuzuPath(FS::YuzuPath::TASDir,
+                    qt_config
+                        ->value(QStringLiteral("tas_directory"),
+                                QString::fromStdString(FS::GetYuzuPathString(FS::YuzuPath::TASDir)))
+                        .toString()
+                        .toStdString());
 
     ReadBasicSetting(Settings::values.gamecard_inserted);
     ReadBasicSetting(Settings::values.gamecard_current_game);
     ReadBasicSetting(Settings::values.gamecard_path);
-  
 
     qt_config->endGroup();
 }
@@ -1205,11 +1203,11 @@ void Config::SaveControlValues() {
     WriteBasicSetting(Settings::values.emulate_analog_keyboard);
     WriteBasicSetting(Settings::values.mouse_panning_sensitivity);
 
-    WriteSetting(QStringLiteral("enable_tas"), Settings::values.tas_enable, false);
-    WriteSetting(QStringLiteral("loop_tas"), Settings::values.tas_loop, false);
-    WriteSetting(QStringLiteral("swap_tas_controllers"), Settings::values.tas_swap_controllers,
-                 true);
-    WriteSetting(QStringLiteral("tas_pause_on_load"), Settings::values.pause_tas_on_load, true);
+    WriteBasicSetting(Settings::values.tas_enable);
+    WriteBasicSetting(Settings::values.tas_loop);
+    WriteBasicSetting(Settings::values.tas_swap_controllers);
+    WriteBasicSetting(Settings::values.pause_tas_on_load);
+
     qt_config->endGroup();
 }
 
@@ -1237,10 +1235,9 @@ void Config::SaveDataStorageValues() {
     WriteSetting(QStringLiteral("dump_directory"),
                  QString::fromStdString(FS::GetYuzuPathString(FS::YuzuPath::DumpDir)),
                  QString::fromStdString(FS::GetYuzuPathString(FS::YuzuPath::DumpDir)));
-    WriteSetting(QStringLiteral("tas_path"),
-        QString::fromStdString(FS::GetYuzuPathString(FS::YuzuPath::TASFile)),
-        QString::fromStdString(FS::GetYuzuPathString(FS::YuzuPath::TASFile)));
-    WriteSetting(QStringLiteral("tas_pause_on_load"), Settings::values.pauseTasOnLoad, true);
+    WriteSetting(QStringLiteral("tas_directory"),
+                 QString::fromStdString(FS::GetYuzuPathString(FS::YuzuPath::TASDir)),
+                 QString::fromStdString(FS::GetYuzuPathString(FS::YuzuPath::TASDir)));
 
     WriteBasicSetting(Settings::values.gamecard_inserted);
     WriteBasicSetting(Settings::values.gamecard_current_game);
diff --git a/src/yuzu/configuration/configure_filesystem.cpp b/src/yuzu/configuration/configure_filesystem.cpp
index 013de02db..9cb317822 100644
--- a/src/yuzu/configuration/configure_filesystem.cpp
+++ b/src/yuzu/configuration/configure_filesystem.cpp
@@ -52,7 +52,6 @@ void ConfigureFilesystem::setConfiguration() {
 
     ui->gamecard_inserted->setChecked(Settings::values.gamecard_inserted.GetValue());
     ui->gamecard_current_game->setChecked(Settings::values.gamecard_current_game.GetValue());
-    ui->tas_pause_on_load->setChecked(Settings::values.pauseTasOnLoad);
     ui->dump_exefs->setChecked(Settings::values.dump_exefs.GetValue());
     ui->dump_nso->setChecked(Settings::values.dump_nso.GetValue());
 
diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp
index ba3720c03..38c59263c 100644
--- a/src/yuzu/configuration/configure_input_player_widget.cpp
+++ b/src/yuzu/configuration/configure_input_player_widget.cpp
@@ -222,23 +222,23 @@ void PlayerControlPreview::UpdateInput() {
 
     if (input_changed) {
         update();
-        ControllerInput input{
-            .axis_values =
-                {std::pair<float, float>{axis_values[Settings::NativeAnalog::LStick].value.x(),
-                                         axis_values[Settings::NativeAnalog::LStick].value.y()},
-                 std::pair<float, float>{axis_values[Settings::NativeAnalog::RStick].value.x(),
-                                         axis_values[Settings::NativeAnalog::RStick].value.y()}},
-            .button_values = button_values,
-            .changed = true,
-        };
-
         if (controller_callback.input != nullptr) {
+            ControllerInput input{
+                .axis_values = {std::pair<float, float>{
+                                    axis_values[Settings::NativeAnalog::LStick].value.x(),
+                                    axis_values[Settings::NativeAnalog::LStick].value.y()},
+                                std::pair<float, float>{
+                                    axis_values[Settings::NativeAnalog::RStick].value.x(),
+                                    axis_values[Settings::NativeAnalog::RStick].value.y()}},
+                .button_values = button_values,
+                .changed = true,
+            };
             controller_callback.input(std::move(input));
         }
     }
 
     if (controller_callback.update != nullptr) {
-        controller_callback.update(std::move(true));
+        controller_callback.update(true);
     }
 
     if (mapping_active) {
diff --git a/src/yuzu/configuration/configure_tas.cpp b/src/yuzu/configuration/configure_tas.cpp
index f2f91d84a..00d6c1ba5 100644
--- a/src/yuzu/configuration/configure_tas.cpp
+++ b/src/yuzu/configuration/configure_tas.cpp
@@ -30,18 +30,18 @@ ConfigureTasDialog::~ConfigureTasDialog() = default;
 void ConfigureTasDialog::LoadConfiguration() {
     ui->tas_path_edit->setText(
         QString::fromStdString(Common::FS::GetYuzuPathString(Common::FS::YuzuPath::TASDir)));
-    ui->tas_enable->setChecked(Settings::values.tas_enable);
-    ui->tas_control_swap->setChecked(Settings::values.tas_swap_controllers);
-    ui->tas_loop_script->setChecked(Settings::values.tas_loop);
-    ui->tas_pause_on_load->setChecked(Settings::values.pause_tas_on_load);
+    ui->tas_enable->setChecked(Settings::values.tas_enable.GetValue());
+    ui->tas_control_swap->setChecked(Settings::values.tas_swap_controllers.GetValue());
+    ui->tas_loop_script->setChecked(Settings::values.tas_loop.GetValue());
+    ui->tas_pause_on_load->setChecked(Settings::values.pause_tas_on_load.GetValue());
 }
 
 void ConfigureTasDialog::ApplyConfiguration() {
     Common::FS::SetYuzuPath(Common::FS::YuzuPath::TASDir, ui->tas_path_edit->text().toStdString());
-    Settings::values.tas_enable = ui->tas_enable->isChecked();
-    Settings::values.tas_swap_controllers = ui->tas_control_swap->isChecked();
-    Settings::values.tas_loop = ui->tas_loop_script->isChecked();
-    Settings::values.pause_tas_on_load = ui->tas_pause_on_load->isChecked();
+    Settings::values.tas_enable.SetValue(ui->tas_enable->isChecked());
+    Settings::values.tas_swap_controllers.SetValue(ui->tas_control_swap->isChecked());
+    Settings::values.tas_loop.SetValue(ui->tas_loop_script->isChecked());
+    Settings::values.pause_tas_on_load.SetValue(ui->tas_pause_on_load->isChecked());
 }
 
 void ConfigureTasDialog::SetDirectory(DirectoryTarget target, QLineEdit* edit) {