2018-01-29 version 1.1.81 (horchi)\n - bugfix: Fixed possible crash on recording update without longdescription\n - change: More readable error message on DBAPI mismatch (thx to Lars!)\n\n1.1.81

3 files changed, 10 insertions, 4 deletions

diff --git a/HISTORY.h b/HISTORY.h
index fedb0f7..385a819 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,8 +5,8 @@
  *
  */
 
-#define _VERSION     "1.1.80"
-#define VERSION_DATE "27.01.2018"
+#define _VERSION     "1.1.81"
+#define VERSION_DATE "29.01.2018"
 
 #define DB_API       5
 
@@ -19,6 +19,10 @@
 /*
  * ------------------------------------
 
+2018-01-29 version 1.1.81 (horchi)
+   - bugfix: Fixed possible crash on recording update without longdescription
+   - change: More readable error message on DBAPI mismatch (thx to Lars!)
+
 2018-01-27 version 1.1.80 (horchi)
    - added: Service to check if event has a timer
 
diff --git a/recording.c b/recording.c
index bd0e390..e572f2b 100644
--- a/recording.c
+++ b/recording.c
@@ -407,7 +407,8 @@ int cUpdate::updateRecordingTable(int fullReload)
                if (event && !isEmpty(event->Aux()) && xml.set(event->Aux()) == success)
                {
                   if (XMLElement* element = xml.getElementByName("longdescription"))
-                     longdescription = element->GetText();
+                     if (!isEmpty(element->GetText()))
+                        longdescription = element->GetText();
                }
 
                if (schedules)
diff --git a/update.c b/update.c
index 55e5427..6b8ef0f 100644
--- a/update.c
+++ b/update.c
@@ -282,7 +282,8 @@ int cUpdate::initDb()
    if (vdrDb->getIntValue("DBAPI") != DB_API)
    {
       if (vdrDb->getIntValue("DBAPI") < DB_API)
-         tell(0, "Found dbapi %d, expected %d, please alter the tables first! Aborting now.",
+         tell(0,  "Your database has version %d, epg2vdr expects version %d. Please make sure, epgd and "
+              "epg2vdr use the same version and the database is properly updated",
               (int)vdrDb->getIntValue("DBAPI"), DB_API);
       else
          tell(0, "Found dbapi %d, expected %d, please update me! Aborting now.",