Fixed getting the maximum short channel name length in case there are no short names at all

This commit is contained in:
Klaus Schmidinger 2012-04-01 09:28:39 +02:00
parent 8f628ceb8c
commit 01c55ad694
3 changed files with 7 additions and 3 deletions

View File

@ -2663,6 +2663,8 @@ Derek Kelly (user.vdr@gmail.com)
could not be determined after resuming recording could not be determined after resuming recording
for reporting a problem with detecting frames for channels that split frames into for reporting a problem with detecting frames for channels that split frames into
several payloads several payloads
for reporting a problem with getting the maximum short channel name length in case there
are no short names at all
Marcel Unbehaun <frostworks@gmx.de> Marcel Unbehaun <frostworks@gmx.de>
for adding cRecordingInfo::GetEvent() for adding cRecordingInfo::GetEvent()

View File

@ -7052,6 +7052,8 @@ Video Disk Recorder Revision History
- Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank - Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank
Schmirler). Schmirler).
2012-03-28: Version 1.7.28 2012-04-01: Version 1.7.28
- Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4. - Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4.
- Fixed getting the maximum short channel name length in case there are no short names
at all (reported by Derek Kelly).

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: channels.c 2.21 2012/03/11 13:29:06 kls Exp $ * $Id: channels.c 2.22 2012/04/01 09:27:08 kls Exp $
*/ */
#include "channels.h" #include "channels.h"
@ -955,7 +955,7 @@ int cChannels::MaxShortChannelNameLength(void)
if (!maxShortChannelNameLength) { if (!maxShortChannelNameLength) {
for (cChannel *channel = First(); channel; channel = Next(channel)) { for (cChannel *channel = First(); channel; channel = Next(channel)) {
if (!channel->GroupSep()) if (!channel->GroupSep())
maxShortChannelNameLength = max(Utf8StrLen(channel->ShortName()), maxShortChannelNameLength); maxShortChannelNameLength = max(Utf8StrLen(channel->ShortName(true)), maxShortChannelNameLength);
} }
} }
return maxShortChannelNameLength; return maxShortChannelNameLength;