Added Deadlock Patch

8 files changed, 8 insertions, 7 deletions

diff --git a/HISTORY b/HISTORY
index c8e04c6..78a145e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -234,3 +234,4 @@ Version 0.1.4
 - Added setup option in detailed EPG view and in detailed recordings view 
   to select if additional EPG pictures are shown if tvscraper media 
   is available
+- Added Deadlock Patch
diff --git a/displaychannel.c b/displaychannel.c
index 96b9b11..fbb6559 100644
--- a/displaychannel.c
+++ b/displaychannel.c
@@ -850,9 +850,9 @@ void cNopacityDisplayChannel::Action(void) {
         }
         if (pixmapPoster)
             pixmapPoster->SetAlpha(Alpha);
+        cPixmap::Unlock();
         if (Running())
             osd->Flush();
-        cPixmap::Unlock();
         int Delta = cTimeMs::Now() - Now;
         if (Running() && (Delta < FrameTime))
             cCondWait::SleepMs(FrameTime - Delta);
diff --git a/displaymenu.c b/displaymenu.c
index b25b1a1..f270647 100644
--- a/displaymenu.c
+++ b/displaymenu.c
@@ -768,9 +768,9 @@ void cNopacityDisplayMenu::Action(void) {
         }
         for (cNopacityTimer *t = timers.First(); Running() && t; t = timers.Next(t))
             t->SetAlpha(Alpha);
+        cPixmap::Unlock();
         if (Running())
             osd->Flush();
-        cPixmap::Unlock();
         int Delta = cTimeMs::Now() - Now;
         if (Running() && (Delta < FrameTime))
             cCondWait::SleepMs(FrameTime - Delta);
diff --git a/displaymessage.c b/displaymessage.c
index cc831a3..3ee1765 100644
--- a/displaymessage.c
+++ b/displaymessage.c
@@ -70,9 +70,9 @@ void cNopacityDisplayMessage::Action(void) {
         int Alpha = t * ALPHA_OPAQUE;
         pixmapBackground->SetAlpha(Alpha);
         pixmap->SetAlpha(Alpha);
+        cPixmap::Unlock();
         if (Running())
             osd->Flush();
-        cPixmap::Unlock();
         int Delta = cTimeMs::Now() - Now;
         if (Running() && (Delta < FrameTime))
             cCondWait::SleepMs(FrameTime - Delta);
diff --git a/displayreplay.c b/displayreplay.c
index 0f3c845..166a04d 100644
--- a/displayreplay.c
+++ b/displayreplay.c
@@ -371,9 +371,9 @@ void cNopacityDisplayReplay::Action(void) {
         pixmapPlay->SetAlpha(Alpha);    
         pixmapFwd->SetAlpha(Alpha);
         pixmapFwdSpeed->SetAlpha(Alpha);
+        cPixmap::Unlock();
         if (Running())
             osd->Flush();
-        cPixmap::Unlock();
         int Delta = cTimeMs::Now() - Now;
         if (Running() && (Delta < FrameTime))
             cCondWait::SleepMs(FrameTime - Delta);
diff --git a/displaytracks.c b/displaytracks.c
index bbcc8ce..b9c7f7e 100644
--- a/displaytracks.c
+++ b/displaytracks.c
@@ -197,9 +197,9 @@ void cNopacityDisplayTracks::Action(void) {
         for (cNopacityMenuItem *item = menuItems.First(); Running() && item; item = menuItems.Next(item)) {
             item->SetAlpha(Alpha);
         }
+        cPixmap::Unlock();
         if (Running())
             osd->Flush();
-        cPixmap::Unlock();
         int Delta = cTimeMs::Now() - Now;
         if (Running() && (Delta < FrameTime))
             cCondWait::SleepMs(FrameTime - Delta);
diff --git a/displayvolume.c b/displayvolume.c
index 5bbca51..03dc4eb 100644
--- a/displayvolume.c
+++ b/displayvolume.c
@@ -141,9 +141,9 @@ void cNopacityDisplayVolume::Action(void) {
         pixmapBackgroundBottom->SetAlpha(Alpha);
         pixmapProgressBar->SetAlpha(Alpha);
         pixmapLabel->SetAlpha(Alpha);
+        cPixmap::Unlock();
         if (Running())
             osd->Flush();
-        cPixmap::Unlock();
         int Delta = cTimeMs::Now() - Now;
         if (Running() && (Delta < FrameTime))
             cCondWait::SleepMs(FrameTime - Delta);
diff --git a/textwindow.c b/textwindow.c
index 54dd49c..b9638f6 100644
--- a/textwindow.c
+++ b/textwindow.c
@@ -212,9 +212,9 @@ void cNopacityTextWindow::Action(void) {
             int Alpha = t * ALPHA_OPAQUE;
             pixmapBackground->SetAlpha(Alpha);
             pixmap->SetAlpha(Alpha);
+            cPixmap::Unlock();
             if (Running())
                 osd->Flush();
-            cPixmap::Unlock();
             int Delta = cTimeMs::Now() - Now;
             if (Running() && (Delta < FadeFrameTime))
                 cCondWait::SleepMs(FadeFrameTime - Delta);