fix merge

Origin commit data
------------------
Branch: ni/coolstream
Commit: b67876271d
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2016-09-20 08:29:03 +02:00
parent 1eae0a97f3
commit c98f6711e7

View File

@@ -136,7 +136,7 @@ void CComponentsFooter::setButtonLabels(const struct button_label_s * const cont
string icon_name = string(content[i].button); string icon_name = string(content[i].button);
//ignore item, if no text and icon are defined; //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); dprintf(DEBUG_INFO, "[CComponentsFooter] [%s - %d] ignore item [%zu], no icon and text defined!\n", __func__, __LINE__, i);
continue; continue;
} }