Index: libs/libmythtv/tv_play.cpp
===================================================================
--- libs/libmythtv/tv_play.cpp  (revision 11371)
+++ libs/libmythtv/tv_play.cpp  (working copy)
@@ -1627,6 +1627,7 @@
                 GetOSD()->TurnDialogOff(dialogname);
                 usleep(1000);
             }
+
             ChangeState(kState_None);
             exitPlayer = false;
         }
@@ -2902,6 +2903,8 @@
     {
         if (nvp)
             nvp->SetBookmark();
+        if (nvp && gContext->GetNumSetting("AutomaticSetWatched", 0))
+            nvp->SetWatched();
         exitPlayer = true;
         wantsToQuit = true;
     }
@@ -5172,6 +5175,8 @@
             int exitprompt = gContext->GetNumSetting("PlaybackExitPrompt");
             if (exitprompt == 1 || exitprompt == 2)
                 nvp->SetBookmark();
+            if (nvp && gContext->GetNumSetting("AutomaticSetWatched", 0))
+                    nvp->SetWatched();
             wantsToQuit = true;
             exitPlayer = true;
         }