Permalink
Browse files

Fixes #7994. Clears the bookmark in some cases when exiting playback.

If the user has PlaybackExitPrompt set to 2 ("Save position and
exit"), then the bookmark should be set any time playback exits, even
at the natural end of playback.  In this case, any existing bookmark
is explicitly cleared, since a bookmark at the end of a recording is
essentially equivalent to a bookmark at the very beginning of the
recording which is equivalent to no bookmark at all.
  • Loading branch information...
stichnot committed Apr 12, 2012
1 parent a7f43b9 commit 6114ecd0b726950364c644afb2230afe8963b424
Showing with 4 additions and 3 deletions.
  1. +4 −3 mythtv/libs/libmythtv/tv_play.cpp
@@ -3197,9 +3197,10 @@ void TV::PrepareToExitPlayer(PlayerContext *ctx, int line, BookmarkAction bookma
ctx->LockDeletePlayer(__FILE__, line);
if (ctx->player)
{
if (bookmark_it && (!(ctx->player->IsNearEnd()) ||
StateIsRecording(GetState(ctx))))
SetBookmark(ctx);
if (bookmark_it)
SetBookmark(ctx,
(ctx->player->IsNearEnd() || getEndOfRecording())
&& !StateIsRecording(GetState(ctx)));
if (db_auto_set_watched)
ctx->player->SetWatched();
}

0 comments on commit 6114ecd

Please sign in to comment.