From 2ce92e459a699b3466dee0061c6815480cbbd3e6 Mon Sep 17 00:00:00 2001
From: EkeEke <ekeeke31@gmail.com>
Date: Mon, 26 Nov 2012 22:48:41 +0100
Subject: [PATCH] fixed broken input system initialization [Gamecube/Wii]

---
 source/gx/config.c   | 8 +++++---
 source/gx/gx_input.c | 4 ----
 source/gx/osd.h      | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/source/gx/config.c b/source/gx/config.c
index 7c643ae..567fd6d 100644
--- a/source/gx/config.c
+++ b/source/gx/config.c
@@ -221,9 +221,6 @@ void config_default(void)
   /* try to restore user config */
   int loaded = config_load();
 
-  /* restore inputs */
-  input_init();
-
 #ifndef HW_RVL
   /* detect progressive mode enable/disable requests */
   PAD_ScanPads();
@@ -255,4 +252,9 @@ void config_default(void)
     GUI_WaitPrompt("Warning","Default Settings restored");
     gx_input_SetDefault();
   }
+
+  /* default emulated inputs */
+  input.system[0] = SYSTEM_MD_GAMEPAD;
+  input.system[1] = (config.input[1].device != -1) ? SYSTEM_MD_GAMEPAD : NO_SYSTEM;
+  input_init();
 }
diff --git a/source/gx/gx_input.c b/source/gx/gx_input.c
index 9a683f6..c382192 100644
--- a/source/gx/gx_input.c
+++ b/source/gx/gx_input.c
@@ -1318,10 +1318,6 @@ void gx_input_SetDefault(void)
       }
     }
   }
-
-  /* default emulated inputs */
-  input.system[0] = SYSTEM_MD_GAMEPAD;
-  input.system[1] = (config.input[1].device != -1) ? SYSTEM_MD_GAMEPAD : NO_SYSTEM;
 }
 
 void gx_input_Config(u8 chan, u8 device, u8 type)
diff --git a/source/gx/osd.h b/source/gx/osd.h
index 4ef09ae..8570d9f 100644
--- a/source/gx/osd.h
+++ b/source/gx/osd.h
@@ -68,7 +68,7 @@
 
 /*************************************************/
 
-#define VERSION "Genesis Plus GX 1.7.2"
+#define VERSION "Genesis Plus GX 1.7.3"
 
 #define NO_SYNC    0
 #define SYNC_VIDEO 1