summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhorchi <vdr@jwendel.de>2018-02-16 18:59:14 +0100
committerhorchi <vdr@jwendel.de>2018-02-16 18:59:14 +0100
commitf91afbf2343fb96ce30628243e97c4a99bfee6da (patch)
tree482b4f2d296c3ccd1dc5742225a86780cb25ef70
parente3ab4d642e6038d2a65c2b45ed65d45385e31830 (diff)
downloadvdr-epg-daemon-f91afbf2343fb96ce30628243e97c4a99bfee6da.tar.gz
vdr-epg-daemon-f91afbf2343fb96ce30628243e97c4a99bfee6da.tar.bz2
dont wakeup for switch timer; epgd-tool update by 3po
-rwxr-xr-xscripts/epgd-tool4
-rw-r--r--update.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/epgd-tool b/scripts/epgd-tool
index 5edcb91..8d7ac33 100755
--- a/scripts/epgd-tool
+++ b/scripts/epgd-tool
@@ -2,7 +2,7 @@
# MySQL helper script by 3PO
-# Update 19.03.2017
+# Update 16.02.2018
PASSWORD=""
@@ -270,7 +270,7 @@ case $1 in
-show-stats|show-stats)
export MYSQL_PWD=epg
- $SQL_EPG2VDR "SELECT version, master, ip, state, FROM_UNIXTIME(updsp,'%D %M %Y% %H:%i:%s') AS 'last touch', FROM_UNIXTIME(lastupd, '%D %M %Y% %H:%i:%s') AS 'last download', FROM_UNIXTIME(nextupd,'%D %M %Y% %H:%i:%s') AS 'next download' FROM vdrs ;"
+ $SQL_EPG2VDR "SELECT version, dbapi, master, ip, state, FROM_UNIXTIME(updsp,'%D %M %Y% %H:%i:%s') AS 'last touch', FROM_UNIXTIME(lastupd, '%D %M %Y% %H:%i:%s') AS 'last download', FROM_UNIXTIME(nextupd,'%D %M %Y% %H:%i:%s') AS 'next download' FROM vdrs ;"
exit
;;
diff --git a/update.c b/update.c
index 78a8854..eb774da 100644
--- a/update.c
+++ b/update.c
@@ -1901,7 +1901,7 @@ int cEpgd::updateSearchTimers(int force, const char* reason)
if (timerDb->getIntValue("_STARTTIME") < time(0) + 2*tmeSecondsPerDay)
{
- if (!timerDb->hasValue("VDRUUID", "any"))
+ if (!timerDb->hasValue("VDRUUID", "any") && !timerDb->hasCharValue("TYPE", ttView))
{
tell(1, "Info: Timer (%ld) for '%s' start in the next 48 hours, "
"try to wakeup VDR to permit takeover",