From 4d76503efd3863e78e91a96cdf0bdd6289cc688c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 30 Sep 2016 08:56:14 +0200 Subject: [PATCH] Move around global variable --- configuration.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configuration.c b/configuration.c index 533bda1c1c..1c0f258af7 100644 --- a/configuration.c +++ b/configuration.c @@ -956,7 +956,6 @@ static void config_set_defaults(void) { unsigned i, j; settings_t *settings = config_get_ptr(); - global_t *global = global_get_ptr(); const char *def_video = config_get_default_video(); const char *def_audio = config_get_default_audio(); const char *def_audio_resampler = config_get_default_audio_resampler(); @@ -1132,6 +1131,8 @@ static void config_set_defaults(void) for (i = 0; i < MAX_USERS; i++) { + global_t *global = global_get_ptr(); + settings->input.joypad_map[i] = i; settings->input.analog_dpad_mode[i] = ANALOG_DPAD_NONE; if (!global->has_set.libretro_device[i])