From 3b3b00861465201406e1c80d8ffc2858b3f0c3ce Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 25 Apr 2017 18:18:37 +0200
Subject: [PATCH] Move code to input_config_reset

---
 config.def.h         |  2 --
 configuration.c      |  9 ---------
 input/input_config.c | 14 ++++++++++++++
 menu/menu_setting.c  |  3 +++
 setting_list.c       |  3 +++
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/config.def.h b/config.def.h
index 4a34cff56f..1dbb541ca9 100644
--- a/config.def.h
+++ b/config.def.h
@@ -27,8 +27,6 @@
 
 #include "input/input_driver.h"
 
-#include "config.def.keybinds.h"
-
 enum video_driver_enum
 {
    VIDEO_GL                 = 0,
diff --git a/configuration.c b/configuration.c
index 07edcb749b..7b7d2b69d2 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1156,15 +1156,6 @@ static void config_set_defaults(void)
    *settings->cheevos.password                 = '\0';
 #endif
 
-   retro_assert(sizeof(settings->input.binds[0]) >= sizeof(retro_keybinds_1));
-   retro_assert(sizeof(settings->input.binds[1]) >= sizeof(retro_keybinds_rest));
-
-   memcpy(input_config_get_binds(0), retro_keybinds_1, sizeof(retro_keybinds_1));
-
-   for (i = 1; i < MAX_USERS; i++)
-      memcpy(input_config_get_binds(i), retro_keybinds_rest,
-            sizeof(retro_keybinds_rest));
-
    input_config_reset();
    input_remapping_set_defaults();
    input_autoconfigure_reset();
diff --git a/input/input_config.c b/input/input_config.c
index 43d0bf9c27..d01bbd1c97 100644
--- a/input/input_config.c
+++ b/input/input_config.c
@@ -23,11 +23,15 @@
 #include <file/file_path.h>
 #include <file/config_file.h>
 #include <string/stdstring.h>
+#include <retro_assert.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
 
+#include "../config.def.h"
+#include "../config.def.keybinds.h"
+
 #include "input_config.h"
 #include "input_keymaps.h"
 #include "input_remapping.h"
@@ -582,6 +586,16 @@ int32_t input_config_get_vid(unsigned port)
 void input_config_reset(void)
 {
    unsigned i;
+   settings_t *settings = config_get_ptr();
+
+   retro_assert(sizeof(settings->input.binds[0]) >= sizeof(retro_keybinds_1));
+   retro_assert(sizeof(settings->input.binds[1]) >= sizeof(retro_keybinds_rest));
+
+   memcpy(input_config_get_binds(0), retro_keybinds_1, sizeof(retro_keybinds_1));
+
+   for (i = 1; i < MAX_USERS; i++)
+      memcpy(input_config_get_binds(i), retro_keybinds_rest,
+            sizeof(retro_keybinds_rest));
    
    for (i = 0; i < MAX_USERS; i++)
    {
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 8fb161886b..7d333f005d 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -35,6 +35,9 @@
 #include "../config.h"
 #endif
 
+#include "config.def.h"
+#include "config.def.keybinds.h"
+
 #if defined(__CELLOS_LV2__)
 #include <sdk_version.h>
 
diff --git a/setting_list.c b/setting_list.c
index c2956ad630..bac5192511 100644
--- a/setting_list.c
+++ b/setting_list.c
@@ -23,6 +23,9 @@
 #include "config.h"
 #endif
 
+#include "config.def.h"
+#include "config.def.keybinds.h"
+
 #ifdef HAVE_MENU
 #include "menu/menu_driver.h"
 #include "menu/widgets/menu_input_dialog.h"