summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--displaymenu.c10
2 files changed, 9 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 64675548..4c93840a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8,6 +8,7 @@ VDR Plugin 'skinflatplus' Revision History
- [fix] rename plugin-icon yaepghg to yaepghd
- [fix] uninitialized pointer in displayrecoding (crash in plex-plugin and others) (thanks chriszero)
- [fix] recordings name in recording menu (thanks to Delekhan @ vdr-portal.de)
+- [fix] dvb widget - discard not used and discard unknown
- [update] default themes
inverted style, selected item fore color is now back color
- [update] disk usage icons with 32 sections instead of 16, thanks to MegaV0lt
diff --git a/displaymenu.c b/displaymenu.c
index 50efcff1..8f0f30d0 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -4298,6 +4298,8 @@ int cFlatDisplayMenu::DrawMainMenuWidgetDVBDevices(int wLeft, int wWidth, int Co
if (channel && channel->Number() > 0) {
chanName = channel->Name();
} else {
+ if( Config.MainMenuWidgetDVBDevicesDiscardUnknown )
+ continue;
chanName = tr("Unknown");
}
strDevice << *chanName;
@@ -4309,6 +4311,8 @@ int cFlatDisplayMenu::DrawMainMenuWidgetDVBDevices(int wLeft, int wWidth, int Co
if (channel && channel->Number() > 0) {
chanName = channel->Name();
} else {
+ if( Config.MainMenuWidgetDVBDevicesDiscardUnknown )
+ continue;
chanName = tr("Unknown");
}
strDevice << *chanName;
@@ -4316,9 +4320,11 @@ int cFlatDisplayMenu::DrawMainMenuWidgetDVBDevices(int wLeft, int wWidth, int Co
} else {
if( channel ) {
cString chanName = channel->Name();
- if( !strcmp(*chanName, "") )
+ if( !strcmp(*chanName, "") ) {
+ if( Config.MainMenuWidgetDVBDevicesDiscardNotUsed )
+ continue;
strDevice << tr("not used");
- else {
+ } else {
if( Config.MainMenuWidgetDVBDevicesDiscardUnknown )
continue;
strDevice << tr("Unknown") << " (" << *chanName << ")";