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

Fixed writing group separators to channels.conf that contain a comma

Browse Source
This commit is contained in:
Klaus Schmidinger 2013-10-11 11:42:19 +02:00
parent 0f75df5452
commit 965b3471b7
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -3169,3 +3169,6 @@ Manfred V
Thomas Maass <mase@setho.org> Thomas Maass <mase@setho.org>
for reporting a difference in the internal sequence of actions when pressing the Blue for reporting a difference in the internal sequence of actions when pressing the Blue
and the Back key, respectively, during replay and the Back key, respectively, during replay
Eike Edener <eike@edener.de>
for reporting a bug in writing group separators to channels.conf that contain a comma

4
HISTORY
View File

@ -7832,9 +7832,11 @@ Video Disk Recorder Revision History
- Fixed cleaning up old EPG events in case no epg data file is given (reported by - Fixed cleaning up old EPG events in case no epg data file is given (reported by
Dave Pickles). Dave Pickles).
2013-09-07: Version 2.0.4 2013-10-11: Version 2.0.4
- Unified the internal sequence of actions when pressing the Blue and the Back key, - Unified the internal sequence of actions when pressing the Blue and the Back key,
respectively, during replay (reported by Thomas Maass). respectively, during replay (reported by Thomas Maass).
- The Yellow button in the main menu no longer acts as "Pause" if "Pause key handling" - The Yellow button in the main menu no longer acts as "Pause" if "Pause key handling"
is set to "do not pause live video" (suggested by Ulf Kiener). is set to "do not pause live video" (suggested by Ulf Kiener).
- Fixed writing group separators to channels.conf that contain a comma (reported by
Eike Edener).

16
channels.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: channels.c 2.24 2012/07/14 12:15:00 kls Exp $ * $Id: channels.c 2.24.1.1 2013/10/11 11:40:02 kls Exp $
*/ */
#include "channels.h" #include "channels.h"
@ -503,12 +503,14 @@ cString cChannel::ToText(const cChannel *Channel)
char FullName[strlen(Channel->name) + 1 + strlen(Channel->shortName) + 1 + strlen(Channel->provider) + 1 + 10]; // +10: paranoia char FullName[strlen(Channel->name) + 1 + strlen(Channel->shortName) + 1 + strlen(Channel->provider) + 1 + 10]; // +10: paranoia
char *q = FullName; char *q = FullName;
q += sprintf(q, "%s", Channel->name); q += sprintf(q, "%s", Channel->name);
if (!isempty(Channel->shortName)) if (!Channel->groupSep) {
q += sprintf(q, ",%s", Channel->shortName); if (!isempty(Channel->shortName))
else if (strchr(Channel->name, ',')) q += sprintf(q, ",%s", Channel->shortName);
q += sprintf(q, ","); else if (strchr(Channel->name, ','))
if (!isempty(Channel->provider)) q += sprintf(q, ",");
q += sprintf(q, ";%s", Channel->provider); if (!isempty(Channel->provider))
q += sprintf(q, ";%s", Channel->provider);
}
*q = 0; *q = 0;
strreplace(FullName, ':', '|'); strreplace(FullName, ':', '|');
cString buffer; cString buffer;