diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2006-04-09 14:31:33 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2006-04-09 14:31:33 +0200 |
| commit | 753c1e1a7f76882091c6ce8a2f0c2d56e0abeb87 (patch) | |
| tree | 602aa269343a6fcc67742ba871de9df73be60945 | |
| parent | 8c75fd1eadd6097dd615267b2666045917824703 (diff) | |
| download | vdr-753c1e1a7f76882091c6ce8a2f0c2d56e0abeb87.tar.gz vdr-753c1e1a7f76882091c6ce8a2f0c2d56e0abeb87.tar.bz2 | |
Now checking whether there is any text before calling cStatus::MsgOsdTextItem()1.3.46
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | menu.c | 11 |
3 files changed, 10 insertions, 4 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index d70f4aff..735e8165 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1434,6 +1434,7 @@ Joachim Wilke <vdr@joachim-wilke.de> runs all the way until the end of the recording for fixing removing the '-' when entering a channel number where there is no other one that fits the input + for reporting a problem with cStatus::MsgOsdTextItem() being called without a text Sascha Klek <sklek@gmx.de> for reporting a problem with the '0' key in the "Day" item of the "Timers" menu @@ -4497,3 +4497,5 @@ Video Disk Recorder Revision History Nissl). - No longer calling cPlugin::ProcessArgs() if VDR is run with the --help or --version option, to avoid error messages from plugins (reported by Udo Richter). +- Now checking whether there is any text before calling cStatus::MsgOsdTextItem() + (reported by Joachim Wilke). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: menu.c 1.427 2006/04/09 13:13:33 kls Exp $ + * $Id: menu.c 1.428 2006/04/09 14:29:24 kls Exp $ */ #include "menu.h" @@ -589,7 +589,8 @@ void cMenuText::Display(void) { cOsdMenu::Display(); DisplayMenu()->SetText(text, font == fontFix); //XXX define control character in text to choose the font??? - cStatus::MsgOsdTextItem(text); + if (text) + cStatus::MsgOsdTextItem(text); } eOSState cMenuText::ProcessKey(eKeys Key) @@ -938,7 +939,8 @@ void cMenuEvent::Display(void) { cOsdMenu::Display(); DisplayMenu()->SetEvent(event); - cStatus::MsgOsdTextItem(event->Description()); + if (event->Description()) + cStatus::MsgOsdTextItem(event->Description()); } eOSState cMenuEvent::ProcessKey(eKeys Key) @@ -1738,7 +1740,8 @@ void cMenuRecording::Display(void) { cOsdMenu::Display(); DisplayMenu()->SetRecording(recording); - cStatus::MsgOsdTextItem(recording->Info()->Description()); + if (recording->Info()->Description()) + cStatus::MsgOsdTextItem(recording->Info()->Description()); } eOSState cMenuRecording::ProcessKey(eKeys Key) |