From 75a5af26c603b460c6c4dcc8b2cc9fc000326bee Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 6 May 2017 05:42:11 +0200
Subject: [PATCH] Revert "(task_autodetect.c) Set input_swap_override later on"

This reverts commit 582573f324fdac9f9495ac718d2f542a366e54cc.
---
 tasks/task_autodetect.c | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c
index b8d381b0ec..68f62cc480 100644
--- a/tasks/task_autodetect.c
+++ b/tasks/task_autodetect.c
@@ -49,8 +49,6 @@ typedef struct autoconfig_params
    int32_t pid;
    uint32_t max_users;
    char autoconfig_directory[4096];
-   bool set_swap;
-   bool swap_val;
 } autoconfig_params_t;
 
 static bool input_autoconfigured[MAX_USERS];
@@ -165,8 +163,8 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
       remote_is_bound = true;
       if (params->idx == 0)
       {
-         params->set_swap = true;
-         params->swap_val = true;
+         settings_t *settings = config_get_ptr();
+         configuration_set_bool(settings, settings->bools.input_swap_override, true);
       }
    }
    else
@@ -182,8 +180,8 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
       {
          if (config_get_bool(conf, "input_swap_override", &tmp))
          {
-            params->set_swap = true;
-            params->swap_val = tmp;
+            settings_t *settings = config_get_ptr();
+            configuration_set_bool(settings, settings->bools.input_swap_override, tmp);
          }
       }
 
@@ -302,18 +300,6 @@ static bool input_autoconfigure_joypad_from_conf_internal(
    return false;
 }
 
-static void input_autoconfigure_connect_finished(void *task_data,
-                           void *user_data, const char *error)
-{
-   autoconfig_params_t *params = (autoconfig_params_t*)task_data;
-
-   if (params && params->set_swap)
-   {
-      settings_t *settings        = config_get_ptr();
-      configuration_set_bool(settings, settings->bools.input_swap_override, params->swap_val);
-   }
-}
-
 static void input_autoconfigure_connect_handler(retro_task_t *task)
 {
    autoconfig_params_t *params = (autoconfig_params_t*)task->state;
@@ -481,9 +467,8 @@ bool input_autoconfigure_connect(
 
    input_autoconfigured[state->idx] = false;
 
-   task->state    = state;
-   task->handler  = input_autoconfigure_connect_handler;
-   task->callback = input_autoconfigure_connect_finished;
+   task->state   = state;
+   task->handler = input_autoconfigure_connect_handler;
 
    task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);