diff -r -u -X diff.exclude myth.15279.0101a/mythtv/libs/libmythtv/tv_play.cpp myth.15279.0101b/mythtv/libs/libmythtv/tv_play.cpp
|
|
|
7646 | 7646 | */ |
7647 | 7647 | bool TV::BookmarkAllowed(void) |
7648 | 7648 | { |
| 7649 | // Allow bookmark of "Record current LiveTV program" |
| 7650 | if (StateIsLiveTV(GetState()) && playbackinfo && |
| 7651 | (playbackinfo->GetAutoExpireFromRecorded() == kLiveTVAutoExpire)) |
| 7652 | return false; |
| 7653 | |
| 7654 | if (StateIsLiveTV(GetState()) && ! playbackinfo) |
| 7655 | return false; |
| 7656 | |
7649 | 7657 | if ((prbuffer->isDVD() && (!gContext->GetNumSetting("EnableDVDBookmark", 0) |
7650 | | || prbuffer->DVD()->GetTotalTimeOfTitle() < 120)) || |
7651 | | StateIsLiveTV(GetState())) |
| 7658 | || prbuffer->DVD()->GetTotalTimeOfTitle() < 120))) |
7652 | 7659 | return false; |
7653 | 7660 | |
7654 | 7661 | return true; |