From 7ed916270e9e445b73d463398187b696b36bb91a Mon Sep 17 00:00:00 2001
From: methodus <methodus@web.de>
Date: Tue, 11 Dec 2012 10:06:18 +0100
Subject: Fixed thread cancelation due timeout. Threads should now exit in a
 clean manner.

---
 plugins/provider/vdrProvider/vdrProvider.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'plugins/provider/vdrProvider')

diff --git a/plugins/provider/vdrProvider/vdrProvider.cpp b/plugins/provider/vdrProvider/vdrProvider.cpp
index 6b4c1b1..f54f4e7 100644
--- a/plugins/provider/vdrProvider/vdrProvider.cpp
+++ b/plugins/provider/vdrProvider/vdrProvider.cpp
@@ -53,6 +53,8 @@ private:
     return uri.substr(6,uri.size()-7);
   }
 
+  cCondWait sleep;
+
 public:
 
   VdrProvider()
@@ -64,7 +66,8 @@ public:
   }
 
   virtual ~VdrProvider(){
-    Cancel(2);
+    sleep.Signal();
+    Cancel(5);
   }
 
   virtual string ProvidesSchema(){ return "vdr"; }
@@ -207,7 +210,7 @@ public:
         lastModified = now;
       }
 
-      sleep(2);
+      sleep.Wait(2000);
     }
 
   }
-- 
cgit v1.2.3