summaryrefslogtreecommitdiff
path: root/coreengine
diff options
context:
space:
mode:
authorlouis <louis.braun@gmx.de>2016-02-20 17:55:27 +0100
committerlouis <louis.braun@gmx.de>2016-02-20 17:55:27 +0100
commit7af7daafc2fcb573ca3d2523f060195c5b6f15de (patch)
tree45341691235c2bafb50a44ba89e5903c8e2ab659 /coreengine
parent6accb0b5638bc68aaf9b3e15fae684284235d820 (diff)
downloadvdr-plugin-skindesigner-7af7daafc2fcb573ca3d2523f060195c5b6f15de.tar.gz
vdr-plugin-skindesigner-7af7daafc2fcb573ca3d2523f060195c5b6f15de.tar.bz2
fixed bug in menu header if title is NULL
Diffstat (limited to 'coreengine')
-rw-r--r--coreengine/viewelementsdisplaymenu.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/coreengine/viewelementsdisplaymenu.c b/coreengine/viewelementsdisplaymenu.c
index cfe0540..1ac085b 100644
--- a/coreengine/viewelementsdisplaymenu.c
+++ b/coreengine/viewelementsdisplaymenu.c
@@ -49,6 +49,8 @@ void cVeDmHeader::SetTokenContainer(void) {
}
void cVeDmHeader::SetTitle(const char *title) {
+ if (!title)
+ return;
if (this->title && !strcmp(this->title, title))
return;
free(this->title);
@@ -79,12 +81,13 @@ void cVeDmHeader::Set(eMenuCategory menuCat) {
//check for standard menu entries
bool hasIcon = false;
- string icon = imgCache->GetIconName(title, menuCat);
- if (imgCache->MenuIconExists(icon))
- hasIcon = true;
-
- tokenContainer->AddStringToken((int)eDMHeaderST::icon, icon.c_str());
- tokenContainer->AddIntToken((int)eDMHeaderIT::hasicon, hasIcon);
+ if (title) {
+ string icon = imgCache->GetIconName(title, menuCat);
+ if (imgCache->MenuIconExists(icon))
+ hasIcon = true;
+ tokenContainer->AddStringToken((int)eDMHeaderST::icon, icon.c_str());
+ tokenContainer->AddIntToken((int)eDMHeaderIT::hasicon, hasIcon);
+ }
//Disc Usage
tokenContainer->AddStringToken((int)eDMHeaderST::vdrusagestring, *cVideoDiskUsage::String());