Always update the still frame timer whenever the timeout changes (inc…

…luding when it should be disabled) to ensure that it doesn't 'expire' accidentally and cause the next still frame (at whatever point in time that may be) to be skipped.

Signed-off-by: Stuart Morgan <smorgan@mythtv.org>

mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp

@@ -657,13 +657,11 @@ int DVDRingBuffer::safe_read(void *data, uint sz)
                     WaitForPlayer();
                 }
 
-                // if the new cell is a still frame, reset the timer
+                // Make sure the still frame timer is updated (if this isn't
+                // a still frame, this will ensure the timer knows about it).
                 if (m_parent)
                 {
-                    if (m_still && (m_still < 0xff))
-                        m_parent->ResetStillFrameTimer();
-                    else
-                        m_parent->SetStillFrameTimeout(0);
+                    m_parent->SetStillFrameTimeout(m_still);
                 }
 
                 // clear menus/still frame selections
@@ -1069,6 +1067,12 @@ void DVDRingBuffer::SkipStillFrame(void)
     QMutexLocker locker(&m_seekLock);
     LOG(VB_PLAYBACK, LOG_INFO, LOC + "Skipping still frame.");
     dvdnav_still_skip(m_dvdnav);
+
+    // Make sure the still frame timer is disabled.
+    if (m_parent)
+    {
+        m_parent->SetStillFrameTimeout(0);
+    }
 }
 
 void DVDRingBuffer::WaitSkip(void)

mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp

@@ -657,7 +657,13 @@ void MythDVDPlayer::ResetStillFrameTimer(void)
 
 void MythDVDPlayer::SetStillFrameTimeout(int length)
 {
-    m_stillFrameLength = length;
+    if (length != m_stillFrameLength)
+    {
+        m_stillFrameTimerLock.lock();
+        m_stillFrameLength = length;
+        m_stillFrameTimer.restart();
+        m_stillFrameTimerLock.unlock();
+    }
 }
 
 void MythDVDPlayer::StillFrameCheck(void)