Ticket #935: 935.patch

programs/mythfrontend/playbackbox.cpp

@@ -130 +130 @@
     previewPixmap = NULL;
     previewStartts = QDateTime::currentDateTime();
     previewChanid = "";
-    
+    previewSuspend = false;
+
     updateFreeSpace = true;
     freeSpaceTotal = 0;
     freeSpaceUsed = 0;
@@ -1947 +1948 @@
     lastProgram = new ProgramInfo(*tvrec);
 
     playingSomething = false;
-    state = kStarting; // restart playback preview
     setEnabled(true);
 
     bool doremove = false;
@@ -1972 +1972 @@
 
     delete tv;
 
+    previewSuspend = doremove;
+
     if (doremove)
     {
         remove(tvrec);
@@ -1980 +1982 @@
     {
         promptEndOfRecording(tvrec);
     }
+    else
+    {
+        state = kStarting; // restart playback preview
+    }
 
     delete tvrec;
 
@@ -2910 +2916 @@
 
 void PlaybackBox::noDelete(void)
 {
+    previewSuspend = false;
     if (!expectingPopup)
         return;
 
@@ -2944 +2951 @@
 void PlaybackBox::doDelete(void)
 {
     if (!expectingPopup)
+    {
+        previewSuspend = false;
         return;
+    }
 
     cancelPopup();
 
@@ -2952 +2962 @@
         (!REC_CAN_BE_DELETED(delitem)))
     {
         showAvailablePopup(delitem);
+        previewSuspend = false;
         return;
     }
 
@@ -2966 +2977 @@
         ProgramInfo *tmpItem = findMatchingProg(delitem);
         if (tmpItem)
             tmpItem->availableStatus = asPendingDelete;
+        previewSuspend = false;
     }
     else
         showDeletePopup(delitem, ForceDeleteRecording);
@@ -2974 +2986 @@
 void PlaybackBox::doForceDelete(void)
 {
     if (!expectingPopup)
+    {
+        previewSuspend = false;
         return;
+    }
 
     cancelPopup();
 
@@ -2982 +2997 @@
         (!REC_CAN_BE_DELETED(delitem)))
     {
         showAvailablePopup(delitem);
+        previewSuspend = false;
         return;
     }
 
@@ -2995 +3011 @@
 void PlaybackBox::doDeleteForgetHistory(void)
 {
     if (!expectingPopup)
+    {
+        previewSuspend = false;
         return;
+    }
 
     cancelPopup();
 
@@ -3003 +3022 @@
         (!REC_CAN_BE_DELETED(delitem)))
     {
         showAvailablePopup(delitem);
+        previewSuspend = false;
         return;
     }
 
@@ -3017 +3037 @@
         ProgramInfo *tmpItem = findMatchingProg(delitem);
         if (tmpItem)
             tmpItem->availableStatus = asPendingDelete;
+        previewSuspend = false;
     }
     else
         showDeletePopup(delitem, ForceDeleteRecording);
@@ -3584 +3605 @@
         
         return retpixmap;
     }
+    else if ((asPendingDelete == pginfo->availableStatus) || previewSuspend)
+    {
+        VERBOSE(VB_IMPORTANT, "previewSuspend or pendingDelete...");
+        if (previewPixmap)
+            retpixmap = *previewPixmap;
 
+        return retpixmap;
+    }
+    VERBOSE(VB_IMPORTANT, "getting preview...");
+
     if (previewPixmap)
     {
         delete previewPixmap;

programs/mythfrontend/playbackbox.h

@@ -330 +330 @@
     QDateTime previewLastModified;
     QDateTime previewFilets;
     QDateTime previewStartts;
+    bool      previewSuspend;
     QString previewChanid;
     int listOrder;