From 7af7daafc2fcb573ca3d2523f060195c5b6f15de Mon Sep 17 00:00:00 2001 From: louis Date: Sat, 20 Feb 2016 17:55:27 +0100 Subject: [PATCH] fixed bug in menu header if title is NULL --- coreengine/viewelementsdisplaymenu.c | 15 +++++++++------ 1 file 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());