From d63589001c9c50aa0d62b41610c12be96be935c5 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 1 Feb 2015 13:15:41 +0100
Subject: [PATCH] Cleanups

---
 menu/menu_entries_cbs.c | 21 +++++++++++++++++++++
 settings_data.c         | 15 +++++----------
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index f2754aec92..c72e59a032 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -4055,6 +4055,24 @@ static void menu_action_setting_disp_set_label_remap_file_load(
          type_str_size);
 }
 
+static void menu_action_setting_disp_set_label_configurations(
+      file_list_t* list,
+      unsigned *w, unsigned type, unsigned i,
+      const char *label,
+      char *type_str, size_t type_str_size,
+      const char *entry_label,
+      const char *path,
+      char *path_buf, size_t path_buf_size)
+{
+   *w = 19;
+   strlcpy(path_buf, path, path_buf_size);
+   if (*g_extern.config_path)
+      fill_pathname_base(type_str, g_extern.config_path,
+            type_str_size);
+   else
+      strlcpy(type_str, "<default>", type_str_size);
+}
+
 static void menu_action_setting_disp_set_label_shader_filter_pass(
       file_list_t* list,
       unsigned *w, unsigned type, unsigned i,
@@ -5240,6 +5258,9 @@ static void menu_entries_cbs_init_bind_get_string_representation(menu_file_list_
    else if (!strcmp(label, "video_shader_default_filter"))
       cbs->action_get_representation =
          menu_action_setting_disp_set_label_shader_default_filter;
+   else if (!strcmp(label, "configurations"))
+      cbs->action_get_representation =
+         menu_action_setting_disp_set_label_configurations;
    else
    {
       switch (type)
diff --git a/settings_data.c b/settings_data.c
index 2a0f6916a0..17fab1af80 100644
--- a/settings_data.c
+++ b/settings_data.c
@@ -2825,22 +2825,17 @@ void setting_data_get_label(void *data, char *type_str,
       return;
 
    setting_data = (rarch_setting_t*)driver.menu->list_settings;
+
+   if (!setting_data)
+      return;
+
    setting = (rarch_setting_t*)setting_data_find_setting(setting_data,
          driver.menu->menu_list->selection_buf->list[idx].label);
 
    if (!setting)
       return;
 
-   if (!strcmp(setting->name, "configurations"))
-   {
-      if (*g_extern.config_path)
-         fill_pathname_base(type_str, g_extern.config_path,
-               type_str_size);
-      else
-         strlcpy(type_str, "<default>", type_str_size);
-   }
-   else
-      setting_data_get_string_representation(setting, type_str, type_str_size);
+   setting_data_get_string_representation(setting, type_str, type_str_size);
 }
 #endif