Cleanups

input/input_remapping.c

@@ -243,19 +243,16 @@ bool input_remapping_save_file(const char *path)
    return ret;
 }
 
-bool input_remapping_remove_file(const char *path)
+bool input_remapping_remove_file(const char *path,
+      const char *dir_input_remapping)
 {
    bool ret                = false;
    size_t path_size        = PATH_MAX_LENGTH * sizeof(char);
    char *buf               = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
    char *remap_file        = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
-   settings_t    *settings = config_get_ptr();
-
    buf[0] = remap_file[0]  = '\0';
 
-   fill_pathname_join(buf, settings->paths.directory_input_remapping,
-         path, path_size);
-
+   fill_pathname_join(buf, dir_input_remapping, path, path_size);
    fill_pathname_noext(remap_file, buf, ".rmp", path_size);
 
    ret = filestream_delete(remap_file) == 0 ? true : false;

input/input_remapping.h

@@ -45,7 +45,8 @@ bool input_remapping_load_file(void *data, const char *path);
  **/
 bool input_remapping_save_file(const char *path);
 
-bool input_remapping_remove_file(const char *path);
+bool input_remapping_remove_file(const char *path,
+      const char *dir_input_remapping);
 
 void input_remapping_set_defaults(bool deinit);
 

menu/cbs/menu_cbs_ok.c

@@ -3074,7 +3074,9 @@ static int generic_action_ok_remap_file_operation(const char *path,
    }
    else
    {
-      if (input_remapping_remove_file(file))
+      if (input_remapping_remove_file(file,
+               settings->paths.directory_input_remapping
+               ))
       {
 #ifdef HAVE_CONFIGFILE
          switch (action_type)