Skip to content

Commit

Permalink
fix(FEC-9333): when playing a playlist and closing the countdown wind…
Browse files Browse the repository at this point in the history
…ow, the next entry starts automatically (#433)

* do not reset the countdown cancel when the postroll is done
* ignore snapback seeking (from dai)
  • Loading branch information
yairans committed Oct 10, 2019
1 parent 138401a commit 813d815
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/components/playlist-countdown/playlist-countdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class PlaylistCountdown extends Component {
*/
componentWillUpdate(nextProps: Object) {
const timeToShow = this._getTimeToShow();
if (nextProps.currentTime > timeToShow) {
if (nextProps.currentTime >= timeToShow) {
this.setState({timeToShow: true});
} else {
this.setState({timeToShow: false});
Expand All @@ -119,6 +119,7 @@ class PlaylistCountdown extends Component {
const timeToShow = this._getTimeToShow();
const countdown = this.props.player.playlist.countdown;
if (
!prevProps.isSeeking &&
!this.props.countdownCanceled &&
(this.props.isPlaybackEnded || (this.props.currentTime >= timeToShow + countdown.duration && this.props.currentTime < this.props.duration))
) {
Expand Down

0 comments on commit 813d815

Please sign in to comment.