Index: libs/libmythtv/tv_play.cpp
===================================================================
--- libs/libmythtv/tv_play.cpp  (revision 11371)
+++ libs/libmythtv/tv_play.cpp  (working copy)
@@ -1615,6 +1615,8 @@
             {
                 ChangeState(RemovePlaying(internalState));
                 endOfRecording = true;
+                if (nvp && gContext->GetNumSetting("AutomaticSetWatched", 0))
+                    nvp->SetWatched();
                 VERBOSE(VB_PLAYBACK, LOC_ERR + "nvp->IsPlaying() timed out");
             }
         }