From 9abbf47a8d11e615308de6f2557e10754b35215a Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Sun, 10 Sep 2017 11:57:07 -0500
Subject: [PATCH] fix defaults

---
 configuration.c         | 4 ++--
 configuration.h         | 4 ++--
 input/input_driver.c    | 4 ++--
 input/input_remapping.c | 4 ++--
 menu/menu_displaylist.c | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configuration.c b/configuration.c
index bb85056ac6..8465bb3c85 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1242,7 +1242,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
    SETTING_BOOL("network_remote_enable",        &settings->bools.network_remote_enable, false, false /* TODO */, false);
 #endif
 #ifdef HAVE_KEYMAPPER
-   SETTING_BOOL("keyboard_mapper_enable",       &settings->bools.keyboard_mapper_enable, false, false /* TODO */, false);
+   SETTING_BOOL("keymapper_enable",       &settings->bools.keymapper_enable, true, true /* TODO */, false);
 #endif
 #ifdef HAVE_NETWORKING
    SETTING_BOOL("netplay_nat_traversal",        &settings->bools.netplay_nat_traversal, true, true, false);
@@ -1347,7 +1347,7 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
    SETTING_UINT("network_remote_base_port",     &settings->uints.network_remote_base_port, true, network_remote_base_port, false);
 #endif
 #ifdef HAVE_KEYMAPPER
-   SETTING_UINT("keyboard_mapper_port",         &settings->uints.keyboard_mapper_port, true, network_remote_base_port, false);
+   SETTING_UINT("keymapper_port",         &settings->uints.keymapper_port, true, 0, false);
 #endif
 #ifdef GEKKO
    SETTING_UINT("video_viwidth",                &settings->uints.video_viwidth, true, video_viwidth, false);
diff --git a/configuration.h b/configuration.h
index 4028527a23..d4a73dba15 100644
--- a/configuration.h
+++ b/configuration.h
@@ -199,7 +199,7 @@ typedef struct settings
       bool savestate_thumbnail_enable;
       bool network_cmd_enable;
       bool stdin_cmd_enable;
-      bool keyboard_mapper_enable;
+      bool keymapper_enable;
       bool network_remote_enable;
       bool network_remote_enable_user[MAX_USERS];
       bool load_dummy_on_core_shutdown;
@@ -305,7 +305,7 @@ typedef struct settings
       unsigned autosave_interval;
       unsigned network_cmd_port;
       unsigned network_remote_base_port;
-      unsigned keyboard_mapper_port;
+      unsigned keymapper_port;
       unsigned video_window_x;
       unsigned video_window_y;
       unsigned video_monitor_index;
diff --git a/input/input_driver.c b/input/input_driver.c
index 894f5be924..b9ac84faaa 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -1378,11 +1378,11 @@ bool input_driver_init_mapper(void)
 #ifdef HAVE_KEYMAPPER
    settings_t *settings = config_get_ptr();
 
-   if (!settings->bools.keyboard_mapper_enable)
+   if (!settings->bools.keymapper_enable)
       return false;
 
    input_driver_mapper = input_mapper_new(
-         settings->uints.keyboard_mapper_port);
+         settings->uints.keymapper_port);
 
    if (input_driver_mapper)
       return true;
diff --git a/input/input_remapping.c b/input/input_remapping.c
index 1b459c27af..cda7ddedc5 100644
--- a/input/input_remapping.c
+++ b/input/input_remapping.c
@@ -84,7 +84,7 @@ bool input_remapping_load_file(void *data, const char *path)
 
          key_remap = -1;
 
-         if (settings->uints.keyboard_mapper_port == i)
+         if (settings->uints.keymapper_port == i)
          {
             if (config_get_int(conf, keymapper_ident[j], &key_remap))
             {
@@ -200,7 +200,7 @@ bool input_remapping_save_file(const char *path)
             else
                config_unset(conf,key_ident[j]);
 
-            if (settings->uints.keyboard_mapper_port == i &&
+            if (settings->uints.keymapper_port == i &&
                 settings->uints.input_keymapper_ids[j] != RETROK_UNKNOWN)
                config_set_int(conf, keymapper_ident[j], settings->uints.input_keymapper_ids[j]);
          }
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index b20fb9aae6..51fabf9d25 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -3510,7 +3510,7 @@ static int menu_displaylist_parse_options_remappings(
       for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++)
       {
          char desc_label[64];
-         unsigned user           = settings->uints.keyboard_mapper_port + 1;
+         unsigned user           = settings->uints.keymapper_port + 1;
          unsigned desc_offset    = retro_id;
          const char *description = NULL;