frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Now checking whether there is any text before calling cStatus::MsgOsdTextItem()

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-04-09 14:31:33 +02:00
parent 8c75fd1ead
commit 753c1e1a7f
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1434,6 +1434,7 @@ Joachim Wilke <vdr@joachim-wilke.de>
runs all the way until the end of the recording runs all the way until the end of the recording
for fixing removing the '-' when entering a channel number where there is no other for fixing removing the '-' when entering a channel number where there is no other
one that fits the input one that fits the input
for reporting a problem with cStatus::MsgOsdTextItem() being called without a text
Sascha Klek <sklek@gmx.de> Sascha Klek <sklek@gmx.de>
for reporting a problem with the '0' key in the "Day" item of the "Timers" menu for reporting a problem with the '0' key in the "Day" item of the "Timers" menu

2
HISTORY
View File

@ -4497,3 +4497,5 @@ Video Disk Recorder Revision History
Nissl). Nissl).
- No longer calling cPlugin::ProcessArgs() if VDR is run with the --help or - 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). --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).

11
menu.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "menu.h"
@ -589,7 +589,8 @@ void cMenuText::Display(void)
{ {
cOsdMenu::Display(); cOsdMenu::Display();
DisplayMenu()->SetText(text, font == fontFix); //XXX define control character in text to choose the font??? 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) eOSState cMenuText::ProcessKey(eKeys Key)
@ -938,7 +939,8 @@ void cMenuEvent::Display(void)
{ {
cOsdMenu::Display(); cOsdMenu::Display();
DisplayMenu()->SetEvent(event); DisplayMenu()->SetEvent(event);
cStatus::MsgOsdTextItem(event->Description()); if (event->Description())
cStatus::MsgOsdTextItem(event->Description());
} }
eOSState cMenuEvent::ProcessKey(eKeys Key) eOSState cMenuEvent::ProcessKey(eKeys Key)
@ -1738,7 +1740,8 @@ void cMenuRecording::Display(void)
{ {
cOsdMenu::Display(); cOsdMenu::Display();
DisplayMenu()->SetRecording(recording); DisplayMenu()->SetRecording(recording);
cStatus::MsgOsdTextItem(recording->Info()->Description()); if (recording->Info()->Description())
cStatus::MsgOsdTextItem(recording->Info()->Description());
} }
eOSState cMenuRecording::ProcessKey(eKeys Key) eOSState cMenuRecording::ProcessKey(eKeys Key)