From 01c55ad694fd5cea8b5a75c273bab8be3a2e7408 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 1 Apr 2012 09:28:39 +0200
Subject: Fixed getting the maximum short channel name length in case there are
no short names at all
---
CONTRIBUTORS | 2 ++
HISTORY | 4 +++-
channels.c | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 54bb679c..27249afc 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2663,6 +2663,8 @@ Derek Kelly (user.vdr@gmail.com)
could not be determined after resuming recording
for reporting a problem with detecting frames for channels that split frames into
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>
for adding cRecordingInfo::GetEvent()
diff --git a/HISTORY b/HISTORY
index 6986ad89..2a7396aa 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7052,6 +7052,8 @@ Video Disk Recorder Revision History
- Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank
Schmirler).
-2012-03-28: Version 1.7.28
+2012-04-01: Version 1.7.28
- 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).
diff --git a/channels.c b/channels.c
index 4108b7b4..65e51348 100644
--- a/channels.c
+++ b/channels.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* 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"
@@ -955,7 +955,7 @@ int cChannels::MaxShortChannelNameLength(void)
if (!maxShortChannelNameLength) {
for (cChannel *channel = First(); channel; channel = Next(channel)) {
if (!channel->GroupSep())
- maxShortChannelNameLength = max(Utf8StrLen(channel->ShortName()), maxShortChannelNameLength);
+ maxShortChannelNameLength = max(Utf8StrLen(channel->ShortName(true)), maxShortChannelNameLength);
}
}
return maxShortChannelNameLength;
--
cgit v1.2.3