3 files changed, 11 insertions, 6 deletions
diff --git a/HISTORY.h b/HISTORY.h
index c33efa7..839aadc 100644
--- a/HISTORY.h
+++ b/HISTORY.h
@@ -5,8 +5,8 @@
  *
  */
 
-#define _VERSION     "1.1.96"
-#define VERSION_DATE  "11.04.2018"
+#define _VERSION     "1.1.97"
+#define VERSION_DATE  "26.09.2018"
 
 #define DB_API       7
 
@@ -19,6 +19,9 @@
 /*
  * ------------------------------------
 
+2018-09-26 version 1.1.97 (horchi)
+   - change: Improved detection of recording end
+
 2018-04-11 version 1.1.96 (horchi)
    - change: Changed menu item for better catagory choice by skin plugin (by Tomas Saxer)
 
diff --git a/handler.h b/handler.h
index d00e1f2..799c144 100644
--- a/handler.h
+++ b/handler.h
@@ -1004,9 +1004,6 @@ class cEpg2VdrEpgHandler : public cEpgHandler
 
       int updateExternalIdsMap(cDbTable* mapDb)
       {
-         cMutexLock lock(&mapMutex);
-
-         externIdMap.clear();
          tell(1, "Handler: Start reading external ids from db");
          mapDb->clear();
 
@@ -1035,6 +1032,9 @@ class cEpg2VdrEpgHandler : public cEpgHandler
          {
             GET_CHANNELS_READ(channels);
 
+            cMutexLock lock(&mapMutex);
+            externIdMap.clear();
+
             for (int f = selectAll->find(); f; f = selectAll->fetch())
             {
                std::string extid = mapDb->getStrValue("ExternalId");
diff --git a/status.c b/status.c
index 10d31c6..df3a9ca 100644
--- a/status.c
+++ b/status.c
@@ -240,7 +240,9 @@ int cUpdate::performRecordingActions()
             else if (!rr->lastBreak)
                rr->lastBreak = time(0);   // store first break
 
-            if (!rr->lastBreak || (time(0) - rr->lastBreak) > allowedBreakDuration)
+            if (!rr->lastBreak ||
+                time(0) - rr->lastBreak > allowedBreakDuration ||
+                time(0) >= rr->timer->StopTime())
             {
                char* infoTxt;