diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2017-05-17 09:17:44 +0200 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2017-05-17 09:17:44 +0200 |
commit | 50211c706a120cf1d7b60898c5e43b15dff6455b (patch) | |
tree | d12a928781aff5f8fee5d4bf6fad5ae57f03b8ae /menu.c | |
parent | ce42e42ed7a4ef206196f68f698ba6cce2b5b7de (diff) | |
download | vdr-50211c706a120cf1d7b60898c5e43b15dff6455b.tar.gz vdr-50211c706a120cf1d7b60898c5e43b15dff6455b.tar.bz2 |
Fixed a crash in case the bottom text of a CAM menu is empty
Diffstat (limited to 'menu.c')
-rw-r--r-- | menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 4.26 2017/05/01 13:01:00 kls Exp $ + * $Id: menu.c 4.27 2017/05/17 09:15:51 kls Exp $ */ #include "menu.h" @@ -2243,7 +2243,7 @@ void cMenuCam::Set(void) SetHasHotkeys(ciMenu->Selectable()); GenerateTitle(ciMenu->TitleText()); dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->TitleText()); - if (*ciMenu->SubTitleText()) { + if (!isempty(ciMenu->SubTitleText())) { dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->SubTitleText()); AddMultiLineItem(ciMenu->SubTitleText()); offset = Count(); @@ -2252,7 +2252,7 @@ void cMenuCam::Set(void) Add(new cOsdItem(hk(ciMenu->Entry(i)), osUnknown, ciMenu->Selectable())); dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->Entry(i)); } - if (*ciMenu->BottomText()) { + if (!isempty(ciMenu->BottomText())) { AddMultiLineItem(ciMenu->BottomText()); dsyslog("CAM %d: '%s'", camSlot->SlotNumber(), ciMenu->BottomText()); } |