From 7d85936e2bcde74af58848aaa6ee15b3bef5abbb Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 25 Jun 2015 08:04:34 +0200
Subject: [PATCH] Move 'No Information is Available' string to menu_hash_us.c

---
 menu/intl/menu_hash_us.c | 3 +++
 menu/menu_setting.c      | 7 +------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/menu/intl/menu_hash_us.c b/menu/intl/menu_hash_us.c
index ad065d7f94..8ac2aa68dd 100644
--- a/menu/intl/menu_hash_us.c
+++ b/menu/intl/menu_hash_us.c
@@ -17,6 +17,8 @@
 #include <stdint.h>
 #include <string.h>
 
+#include <compat/strl.h>
+
 #include "../menu_hash.h"
 #include "../../configuration.h"
 
@@ -2255,6 +2257,7 @@ int menu_hash_get_help_us(uint32_t hash, char *s, size_t len)
                "Positive Y axis is down.");
          break;
       default:
+         strlcpy(s, "No information is available.", len);
          return -1;
    }
 
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 28a2800b91..ff8183a718 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -2035,12 +2035,7 @@ int setting_get_description(const char *label, char *s,
 {
    uint32_t label_hash       = menu_hash_calculate(label);
 
-   if (menu_hash_get_help(label_hash, s, len) == 0)
-      return 0;
-
-   strlcpy(s, "No information is available.", len);
-
-   return 0;
+   return menu_hash_get_help(label_hash, s, len);
 }
 
 static void get_string_representation_bind_device(void * data, char *s,