From ca43ef1eacd45f8c188db1bea9c5a054bbd0fd24 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 26 Jun 2015 07:45:54 +0200
Subject: [PATCH] Fix shader parameters' values being shown again

---
 menu/cbs/menu_cbs_get_value.c | 12 ++++++++----
 menu/cbs/menu_cbs_iterate.c   |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 72d81132ea..4362b4ff70 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -985,10 +985,6 @@ static int menu_cbs_init_bind_get_string_representation_compare_type(
          && type <= MENU_SETTINGS_SHADER_PRESET_PARAMETER_LAST)
       cbs->action_get_value =
          menu_action_setting_disp_set_label_shader_preset_parameter;
-   else if (type >= MENU_SETTINGS_SHADER_PARAMETER_0
-         && type <= MENU_SETTINGS_SHADER_PARAMETER_LAST)
-      cbs->action_get_value =
-         menu_action_setting_disp_set_label_shader_parameter;
    else
    {
       switch (type)
@@ -1098,6 +1094,14 @@ int menu_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *cbs,
    if (!cbs)
       return -1;
 
+   if (type >= MENU_SETTINGS_SHADER_PARAMETER_0
+         && type <= MENU_SETTINGS_SHADER_PARAMETER_LAST)
+   {
+      cbs->action_get_value =
+         menu_action_setting_disp_set_label_shader_parameter;
+      return 0;
+   }
+
    if (menu_cbs_init_bind_get_string_representation_compare_label(cbs, label_hash) == 0)
       return 0;
 
diff --git a/menu/cbs/menu_cbs_iterate.c b/menu/cbs/menu_cbs_iterate.c
index 4f6ab3d00a..463be39e0f 100644
--- a/menu/cbs/menu_cbs_iterate.c
+++ b/menu/cbs/menu_cbs_iterate.c
@@ -180,7 +180,7 @@ static int action_iterate_help(char *s, size_t len, const char *label)
    }
 
    snprintf(s, len,
-         "-- Welcome to RetroArch --\n"
+         "Welcome to RetroArch\n"
          " \n" // strtok_r doesn't split empty strings.
 
          "Basic Menu controls:\n"