From 804c62cc9e6b5715b9c325f4aae943b9263094de Mon Sep 17 00:00:00 2001 From: radius Date: Tue, 12 Sep 2017 01:47:43 -0500 Subject: [PATCH] clear the remap flags --- input/input_remapping.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/input/input_remapping.c b/input/input_remapping.c index 718932d110..9f147bbf8c 100644 --- a/input/input_remapping.c +++ b/input/input_remapping.c @@ -252,10 +252,15 @@ void input_remapping_set_defaults(bool deinit) settings_t *settings = config_get_ptr(); global_t *global = global_get_ptr(); - if (!global) - return; + if (!global) + return; - global->name.remapfile[0] = '\0'; + if (deinit) + { + global->name.remapfile[0] = '\0'; + rarch_ctl(RARCH_CTL_UNSET_REMAPS_CORE_ACTIVE, NULL); + rarch_ctl(RARCH_CTL_UNSET_REMAPS_GAME_ACTIVE, NULL); + } for (i = 0; i < MAX_USERS; i++) {