From: Chris Tallon <chris@vomp.tv>
Date: Tue, 17 Jun 2008 20:52:15 +0000 (+0000)
Subject: Fix for power button freeze when rec bar is displayed
X-Git-Tag: r0-3-0~5
X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=4eb69cd83a37b8864813b1763d61b7b3d5d0e859;p=vompclient.git

Fix for power button freeze when rec bar is displayed
---

diff --git a/vvideorec.cc b/vvideorec.cc
index 913d1bc..da60136 100644
--- a/vvideorec.cc
+++ b/vvideorec.cc
@@ -129,11 +129,6 @@ void VVideoRec::preDelete()
 {
   timers->cancelTimer(this, 1);
   timers->cancelTimer(this, 2);
-}
-
-VVideoRec::~VVideoRec()
-{
-  Log::getInstance()->log("VVideoRec", Log::DEBUG, "Entering vvideorec destructor");
 
   if (vas)
   {
@@ -144,6 +139,12 @@ VVideoRec::~VVideoRec()
   if (vsummary) delete vsummary;
 
   if (playing) stopPlay();
+}
+
+VVideoRec::~VVideoRec()
+{
+  Log::getInstance()->log("VVideoRec", Log::DEBUG, "Entering vvideorec destructor");
+
   video->setDefaultAspect();
 
   // kill recInfo in case resumePoint has changed (likely)
@@ -535,8 +536,11 @@ void VVideoRec::stopPlay()
   Log::getInstance()->log("VVideoRec", Log::DEBUG, "Pre stopPlay");
 
   removeBar();
+  Log::getInstance()->log("VVideoRec", Log::DEBUG, "1");
   player->stop();
+  Log::getInstance()->log("VVideoRec", Log::DEBUG, "2");
   vdr->stopStreaming();
+  Log::getInstance()->log("VVideoRec", Log::DEBUG, "3");
   delete player;
 
   playing = false;
@@ -822,7 +826,9 @@ void VVideoRec::removeBar()
   barScanHold = false;
   barVasHold = false;
   rectangle(barRegion, transparent);
+  Log::getInstance()->log("TEMP", Log::DEBUG, "A3");
   boxstack->update(this, &barRegion);
+  Log::getInstance()->log("TEMP", Log::DEBUG, "A4");
 }
 
 void VVideoRec::doSummary()