From 3dcca7e06054fe9fc7be209b6728463e645b517c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Tue, 17 Nov 2015 00:37:13 +0100
Subject: [PATCH] Cleanups

---
 menu/cbs/menu_cbs_get_value.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index b8c9196a9c..18c5675335 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -1028,7 +1028,10 @@ static void menu_action_setting_disp_set_label(file_list_t* list,
       core_opt = core_option_get_val(system->core_options,
                type - MENU_SETTINGS_CORE_OPTION_START);
 
-      strlcpy(s, core_opt ? core_opt : "", len);
+      strlcpy(s, "", len);
+
+      if (core_opt)
+         strlcpy(s, core_opt, len);
    }
    else if (type >= MENU_SETTINGS_CORE_OPTION_CREATE)
    {