From 41eb32389dd3138c9e54a7fa87ae9f7be4a00aa3 Mon Sep 17 00:00:00 2001 From: kamel5 Date: Sat, 7 Sep 2019 17:23:32 +0200 Subject: [PATCH] Fixed a possible deadlock in detailview --- detailview.c | 4 ++-- view.c | 6 +++--- 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); }