summaryrefslogtreecommitdiff
path: root/util.c
diff options
context:
space:
mode:
authorDimitar Petrovski <dimeptr@gmail.com>2012-10-21 17:23:23 (GMT)
committerDimitar Petrovski <dimeptr@gmail.com>2012-10-21 17:23:23 (GMT)
commitdf5e0613eac71ab69e59dda0cd7dfa2328c424d4 (patch)
tree2af33abfbcf660cbf360d5099d9154a006c250e7 /util.c
parent88d15f1630d5fdff6f18394f9ad4a94943696976 (diff)
parentec0ef17a51e2b357ef89e429fa0e0b69731cad77 (diff)
downloadvdr-plugin-eepg-df5e0613eac71ab69e59dda0cd7dfa2328c424d4.tar.gz
vdr-plugin-eepg-df5e0613eac71ab69e59dda0cd7dfa2328c424d4.tar.bz2
Merge branch 'ceit2' into map-event-ceit2
Conflicts: util.c
Diffstat (limited to 'util.c')
-rw-r--r--util.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/util.c b/util.c
index bf5455a..ae8c869 100644
--- a/util.c
+++ b/util.c
@@ -123,7 +123,7 @@ void CleanString (unsigned char *String)
}
Src++;
}
- if (Spaces > 0) {
+ if (Spaces > 0 && String && String < Dst) {
Dst--;
*Dst = 0;
} else {
@@ -192,6 +192,7 @@ cAddEventThread::~cAddEventThread(void)
void cAddEventThread::Action(void)
{
+ LogD (0, prep("Action"));
SetPriority(19);
while (Running() && !LastHandleEvent.TimedOut()) {
// cAddEventListItem *e = NULL;
@@ -251,7 +252,7 @@ void cAddEventThread::AddEvent(cEvent *Event, tChannelID ChannelID)
LogD (0, prep("AddEventT else"));
(*map_list->find(ChannelID)).second->Add(Event);
}
-// list->Add(new cAddEventListItem(Event, ChannelID));
+// LogD (0, prep("AddEventT %s channel: <%s>"), Event->Title(), *ChannelID.ToString());
LastHandleEvent.Set(INSERT_TIMEOUT_IN_MS);
LogD (0, prep("AddEventT end"));
}
@@ -262,7 +263,7 @@ static cAddEventThread AddEventThread;
void AddEvent(cEvent *Event, tChannelID ChannelID)
{
- LogD (0, prep("AddEvent"));
+// LogD (0, prep("AddEvent %s channel: <%s>"), Event->Title(), *ChannelID.ToString());
AddEventThread.AddEvent(Event, ChannelID);
if (!AddEventThread.Active())
AddEventThread.Start();