From 8da9f0f034940a3ff3b0256c956a5ce925c192cd Mon Sep 17 00:00:00 2001
From: Peter Bieringer <pb@bieringer.de>
Date: Mon, 15 Feb 2021 19:34:34 +0100
Subject: move thread cancel in new introduced Stop() function (hint by VDR
 maintainer)

---
 HISTORY   | 2 ++
 display.c | 7 +++++--
 display.h | 1 +
 plugin.c  | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/HISTORY b/HISTORY
index 364abc4..0592847 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,5 +1,7 @@
 VDR Plugin 'graphlcd' Revision History
 -------------------------------------
+2021-02-15: Version 1.0.5
+- [pbiering] move thread cancel in new introduced Stop() function (hint by VDR maintainer)
 
 2021-02-08: Version 1.0.4
 - [pbiering] add support for new feature: NumRecordings and ListRecordings
diff --git a/display.c b/display.c
index 0158366..7806f80 100644
--- a/display.c
+++ b/display.c
@@ -60,8 +60,6 @@ cGraphLCDDisplay::cGraphLCDDisplay()
 
 cGraphLCDDisplay::~cGraphLCDDisplay()
 {
-    Cancel(3);
-
     delete mSkin;
     delete mSkinConfig;
     delete mScreen;
@@ -70,6 +68,11 @@ cGraphLCDDisplay::~cGraphLCDDisplay()
     delete mService;
 }
 
+void cGraphLCDDisplay::Stop (void)
+{
+    Cancel(3);
+}
+
 bool cGraphLCDDisplay::Initialise(GLCD::cDriver * Lcd, const std::string & CfgPath, const std::string & SkinsPath, const std::string & SkinName)
 {
     std::string skinsPath;
diff --git a/display.h b/display.h
index 2bb971a..cd4182e 100644
--- a/display.h
+++ b/display.h
@@ -56,6 +56,7 @@ public:
     ~cGraphLCDDisplay(void);
 
     bool Initialise(GLCD::cDriver * Lcd, const std::string & CfgPath, const std::string & SkinsPath, const std::string & SkinName);
+    void Stop(void);
     void Tick();
     void Update();
     void Clear();
diff --git a/plugin.c b/plugin.c
index 65a59f8..517c23b 100644
--- a/plugin.c
+++ b/plugin.c
@@ -39,7 +39,7 @@
 
 
 static const char * kPluginName = "graphlcd";
-static const char *VERSION        = "1.0.4";
+static const char *VERSION        = "1.0.5";
 static const char *DESCRIPTION    = trNOOP("Output to graphic LCD");
 static const char *MAINMENUENTRY  = NULL;
 
-- 
cgit v1.2.3