From c98f6711e7395d1458dbb8719a57dcfa13980263 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 20 Sep 2016 08:29:03 +0200 Subject: [PATCH] fix merge Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b67876271d52f86c3148c3f9b23bff61cfe497cc Author: vanhofen Date: 2016-09-20 (Tue, 20 Sep 2016) Origin message was: ------------------ - fix merge ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/components/cc_frm_footer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/components/cc_frm_footer.cpp b/src/gui/components/cc_frm_footer.cpp index fbeb1c1c6..e80c22177 100644 --- a/src/gui/components/cc_frm_footer.cpp +++ b/src/gui/components/cc_frm_footer.cpp @@ -136,7 +136,7 @@ void CComponentsFooter::setButtonLabels(const struct button_label_s * const cont string icon_name = string(content[i].button); //ignore item, if no text and icon are defined; - if (txt.empty() && btn_name.empty()){ + if (txt.empty() && icon_name.empty()){ dprintf(DEBUG_INFO, "[CComponentsFooter] [%s - %d] ignore item [%zu], no icon and text defined!\n", __func__, __LINE__, i); continue; }