From 946e9d8b7e1d099c9b488efc1fbe648ef0ca1111 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sat, 18 Feb 2017 23:45:30 +0100
Subject: [PATCH] joystick_init() is now called after loading the configuration
 file - makes the emulator not load the joystick at all if joystick_type is
 set to 7 (No Joystick).

---
 src/pc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pc.c b/src/pc.c
index 85659113c..e0ab1e0db 100644
--- a/src/pc.c
+++ b/src/pc.c
@@ -240,7 +240,6 @@ void initpc(int argc, char *argv[])
 
         keyboard_init();
         mouse_init();
-        joystick_init();
         midi_init();
 
 	if (config_file == NULL)
@@ -257,6 +256,8 @@ void initpc(int argc, char *argv[])
         if (config_file)
                 saveconfig();
 
+        joystick_init();
+
         cpuspeed2=(AT)?2:1;
 //        cpuspeed2=cpuspeed;
         atfullspeed=0;