diff options
author | Antti Ajanki <antti.ajanki@iki.fi> | 2010-07-24 19:19:19 +0300 |
---|---|---|
committer | Antti Ajanki <antti.ajanki@iki.fi> | 2010-07-24 19:19:19 +0300 |
commit | 538ad1c5720c72619a62a9c029b73ad5cde1499e (patch) | |
tree | 9b0636de51455ad463338e569c5ad55360c3f8fb /src | |
parent | fffeaa5d5f5b421e5b6eddd6d42b141ace04641e (diff) | |
download | vdr-plugin-webvideo-538ad1c5720c72619a62a9c029b73ad5cde1499e.tar.gz vdr-plugin-webvideo-538ad1c5720c72619a62a9c029b73ad5cde1499e.tar.bz2 |
Fix timer reporting "unfinished" error after being completed
Diffstat (limited to 'src')
-rw-r--r-- | src/vdr-plugin/menu_timer.c | 10 | ||||
-rw-r--r-- | src/vdr-plugin/timer.c | 3 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/vdr-plugin/menu_timer.c b/src/vdr-plugin/menu_timer.c index 0501e0d..c72c790 100644 --- a/src/vdr-plugin/menu_timer.c +++ b/src/vdr-plugin/menu_timer.c @@ -15,11 +15,6 @@ #define ARRAYSIZE(a) sizeof(a)/sizeof(a[0]) -/* -const char *intervalNames[] = {trNOOP("Once per day"), trNOOP("Once per week"), - trNOOP("Once per month")}; -*/ - const char *intervalNames[] = {NULL, NULL, NULL}; const int intervalValues[] = {24*60*60, 7*24*60*60, 30*24*60*60}; @@ -70,6 +65,11 @@ cEditWebviTimerMenu::cEditWebviTimerMenu(cWebviTimer &timer, cString lastUpdated = cString::sprintf("%s\t%s", tr("Last fetched:"), lastTime); Add(new cOsdItem(lastUpdated, osUnknown, false)); + // still running? + if (timer.Running()) { + Add(new cOsdItem("Timer active", osUnknown, false); + } + // error if (!timer.Success()) { Add(new cOsdItem(tr("Error on last refresh!"), osUnknown, false)); diff --git a/src/vdr-plugin/timer.c b/src/vdr-plugin/timer.c index f9fef59..2ef519f 100644 --- a/src/vdr-plugin/timer.c +++ b/src/vdr-plugin/timer.c @@ -83,7 +83,7 @@ void cWebviTimer::Execute() { cWebviThread::Instance().AddRequest(req); lastUpdate = time(NULL); - SetError("Unfinished"); + SetError(NULL); parent->SetModified(); activeStreams.Clear(); @@ -166,7 +166,6 @@ void cWebviTimer::DownloadStreams(const char *menuxml, cProgressVector& summarie xmlFreeDoc(doc); if (activeStreams.Size() == 0) { - SetError(NULL); running = false; } } |