summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkamel5 <vdr.kamel5 (at) gmx (dot) net>2019-09-07 17:23:32 +0200
committerkamel5 <vdr.kamel5 (at) gmx (dot) net>2019-09-07 17:23:32 +0200
commit41eb32389dd3138c9e54a7fa87ae9f7be4a00aa3 (patch)
treea7988f0989e90fa12f8275cbd27f99cd04532230
parentf4369c077258f4d64d9ff66b854fd8e7aee4548c (diff)
downloadvdr-plugin-tvguide-41eb32389dd3138c9e54a7fa87ae9f7be4a00aa3.tar.gz
vdr-plugin-tvguide-41eb32389dd3138c9e54a7fa87ae9f7be4a00aa3.tar.bz2
Fixed a possible deadlock in detailview
-rw-r--r--detailview.c4
-rw-r--r--view.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/detailview.c b/detailview.c
index 8042f9d..5fab050 100644
--- a/detailview.c
+++ b/detailview.c
@@ -1,12 +1,12 @@
#include "detailview.h"
-cDetailView::cDetailView(const cEvent *event, cFooter *footer) {
+cDetailView::cDetailView(const cEvent *event, cFooter *footer) : cThread("DetailView") {
this->event = event;
this->footer = footer;
}
cDetailView::~cDetailView(void){
- Cancel(-1);
+ Cancel(3);
while (Active())
cCondWait::SleepMs(10);
#if VDRVERSNUM >= 20301
diff --git a/view.c b/view.c
index 806a3da..4a5707c 100644
--- a/view.c
+++ b/view.c
@@ -5,7 +5,7 @@
* cView
********************************************************************************************/
-cView::cView(void) {
+cView::cView(void) : cThread("View") {
activeView = 0;
scrollable = false;
tabbed = false;
@@ -641,7 +641,7 @@ cSeriesView::cSeriesView(int seriesId, int episodeId) : cView() {
}
cSeriesView::~cSeriesView(void) {
- Cancel(-1);
+ Cancel(3);
while (Active())
cCondWait::SleepMs(10);
}
@@ -863,7 +863,7 @@ cMovieView::cMovieView(int movieId) : cView() {
}
cMovieView::~cMovieView(void) {
- Cancel(-1);
+ Cancel(3);
while (Active())
cCondWait::SleepMs(10);
}