Index: mythtv/libs/libmythtv/tv_play.cpp
===================================================================
--- mythtv/libs/libmythtv/tv_play.cpp	(revision 21336)
+++ mythtv/libs/libmythtv/tv_play.cpp	(working copy)
@@ -933,6 +933,8 @@
 
     gContext->removeListener(this);
 
+    GetMythMainWindow()->SetDrawEnabled(true);
+    
     if (myWindow)
     {
         MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
@@ -1757,6 +1759,7 @@
         VERBOSE(VB_IMPORTANT, "We have a RingBuffer");
 
         GetMythUI()->DisableScreensaver();
+        GetMythMainWindow()->SetDrawEnabled(false);
 
         if (ctx->playingInfo && StartRecorder(ctx,-1))
         {
@@ -1821,6 +1824,7 @@
 
         if (ctx->buffer && ctx->buffer->IsOpen())
         {
+            GetMythMainWindow()->SetDrawEnabled(false);
             GetMythUI()->DisableScreensaver();
 
             if (desiredNextState == kState_WatchingRecording)
@@ -7924,6 +7928,7 @@
     else
     {
         //we are embedding in a mythui window so show the gui paint window again
+        GetMythMainWindow()->SetDrawEnabled(true);
         GetMythMainWindow()->GetPaintWindow()->show();
     }
 }
@@ -8636,6 +8641,7 @@
 
         GetMythMainWindow()->GetPaintWindow()->hide();
         GetMythMainWindow()->GetPaintWindow()->clearMask();
+        GetMythMainWindow()->SetDrawEnabled(false);
 
         qApp->processEvents();
         DrawUnusedRects(true, actx);