summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhorchi <vdr@jwendel.de>2017-06-22 04:30:01 (GMT)
committerhorchi <vdr@jwendel.de>2017-06-22 04:30:01 (GMT)
commit7995f55519cdbda69c8997ee8c0ab444ade2e3f3 (patch)
tree4e700c5e7a14ddcb6a76dc11b5a9b2eb5317d1c9
parent1ab2b56758d06c5460a25cd55ce471c98ee78d72 (diff)
downloadvdr-plugin-epg2vdr-1.1.70.tar.gz
vdr-plugin-epg2vdr-1.1.70.tar.bz2
2017-06-22 version 1.1.70 (horchi)\n - change: Fixed possible crash with unknown channels on wrong configuration\n\n1.1.70
-rw-r--r--HISTORY.h5
-rw-r--r--Makefile2
-rw-r--r--update.c4
3 files changed, 8 insertions, 3 deletions
diff --git a/HISTORY.h b/HISTORY.h
index 280151c..a176f2c 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,7 +5,7 @@
*
*/
-#define _VERSION "1.1.69"
+#define _VERSION "1.1.70"
#define VERSION_DATE "22.06.2017"
#define DB_API 4
@@ -19,6 +19,9 @@
/*
* ------------------------------------
+2017-06-22 version 1.1.70 (horchi)
+ - change: Fixed possible crash with unknown channels on wrong configuration
+
2017-06-22 version 1.1.69 (horchi)
- change: More rework of lock handling
diff --git a/Makefile b/Makefile
index c1030e8..5449ed4 100644
--- a/Makefile
+++ b/Makefile
@@ -211,8 +211,10 @@ vcheck:
push: vcheck
echo "tagging git with $(VERSION)"
git push
+ git push github master
git tag $(VERSION)
git push --tags
+ git push github master --tags
commit: vcheck
git commit -m "$(LASTCOMMENT)" -a
diff --git a/update.c b/update.c
index 48fb523..a470992 100644
--- a/update.c
+++ b/update.c
@@ -1500,10 +1500,10 @@ int cUpdate::refreshEpg(const char* forChannelId, int maxTries)
// get channel and schedule of channel
- if (channel = channels->GetByChannelID(channelId, true))
+ if (channelId && channel = channels->GetByChannelID(channelId, true))
s = (cSchedule*)schedules->GetSchedule(channel, true);
else
- tell(0, "Error: Channel with ID '%s' don't exist on this VDR", (const char*)channelId.ToString());
+ tell(0, "Error: Channel with ID '%s' don't exist on this VDR", mapDb->getStrValue("ChannelId"));
if (!schedules || !channels || !timers || !s)
{