Index: playbackbox.cpp
===================================================================
--- playbackbox.cpp	(revision 15332)
+++ playbackbox.cpp	(working copy)
@@ -520,6 +520,7 @@
     while (previewVideoState != kKilled && previewVideoState != kStopped &&
            previewVideoThreadRunning)
     {
+        killPlayer();
         /* ensure that key events don't mess up our previewVideoStates */
         previewVideoState = (previewVideoState == kKilled) ?
             kKilled :  kKilling;
@@ -2285,7 +2286,7 @@
             (previewVideoKillTimeout.elapsed() > 2000))
         {
             pthread_join(previewVideoThread, NULL);
-            previewVideoThreadRunning = true;
+            previewVideoThreadRunning = false;
             delete previewVideoNVP;
             delete previewVideoRingBuf;
 
@@ -4960,7 +4961,8 @@
 
             recGroupType[query.value(0).toString()] = "recgroup";
 
-            if (dispGroup != "LiveTV" || liveTVInAll)
+            if ((dispGroup != "LiveTV" || liveTVInAll) &&
+                (dispGroup != "Deleted"))
                 totalItems += items;
         }
     }