Ticket #6147: dvd_screensaver_fix3.diff

libs/libmythtv/DVDRingBuffer.cpp

@@ -337 +337 @@
                 cellid = 0;
                 cellRepeated = false;
                 menupktpts = 0;
-                if (cellHasStillFrame)
-                    GetMythUI()->DisableScreensaver();
                 InStillFrame(false);
 
-                if (parent && IsInMenu())
+                if (IsInMenu())
                 {
-                    parent->HideDVDButton(true);
+                    if (parent)
+                        parent->HideDVDButton(true);
                     autoselectaudio = true;
                     autoselectsubtitle = true;
+                    if (!GetMythUI()->GetScreensaverEnabled())
+                        GetMythUI()->RestoreScreensaver();
+                }
+                else
+                {
+                    if (GetMythUI()->GetScreensaverEnabled())
+                        GetMythUI()->DisableScreensaver();
                 }
 
                 if (blockBuf != dvdBlockWriteBuf)

libs/libmythtv/avformatdecoder.cpp

@@ -3196 +3196 @@
                 if (storedPackets.count() < 2 && !decodeStillFrame)
                     storevideoframes = true;
                 
-                VERBOSE(VB_EXTRA, QString("DVD Playback Debugging"
+                VERBOSE(VB_EXTRA, QString("DVD Playback Debugging "
                     "inDVDMenu %1 storedPacketcount %2 dvdstill %3")
                     .arg(inDVDMenu).arg(storedPackets.count()).arg(inDVDStill));
                 
@@ -3335 +3335 @@
             if (!decodeStillFrame && inDVDStill)
             {
                 decodeStillFrame = true;
-                GetMythUI()->RestoreScreensaver();
                 d->ResetMPEG2();
             }