Fix live TV sometimes pausing at channel changes.

Regression introduced in 91ec76e and related commits.
MythTV · Jan 14, 2013 · 47a2da4 · 47a2da4
1 parent fcf176d
commit 47a2da4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -1189,7 +1189,11 @@ bool MythPlayer::HasReachedEof(void) const
         return true;
     if (GetEditMode())
         return false;
-    return (framesPlayed >= deleteMap.GetLastFrame());
+    if (livetv)
+        return false;
+    if (framesPlayed >= deleteMap.GetLastFrame())
+        return true;
+    return false;
 }
 
 VideoFrame *MythPlayer::GetCurrentFrame(int &w, int &h)
@@ -3708,7 +3712,6 @@ bool MythPlayer::IsNearEnd(void)
     margin = (long long) (margin * audio.GetStretchFactor());
     bool watchingTV = IsWatchingInprogress();
 
-    framesRead = decoder->GetFramesRead();
     framesRead = framesPlayed;
 
     if (!player_ctx->IsPIP() &&