Merge pull request #1519 from avalonmediasystem/staging

Staging
avalonmediasystem · Jan 9, 2017 · af8b3da · af8b3da
2 parents 6f887e6 + 8e0f36e
commit af8b3da
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/views/playlists/_player.html.erb b/app/views/playlists/_player.html.erb
@@ -113,7 +113,7 @@ Unless required by applicable law or agreed to in writing, software distributed
  // if player's new currenttime is >= end of playlist item or equal to mf duration, advance to next playlist item
  if (t > Math.round(avalonPlayer.stream_info.t[1]*10) || t == Math.round(avalonPlayer.player.media.duration*10)) {
  // advance only if player media duration matches stream_info duration (it might not when switching sections)
- if (avalonPlayer.player.media.duration - avalonPlayer.stream_info.duration < 0.5) {
+ if (Math.round(avalonPlayer.player.media.duration) == Math.round(avalonPlayer.stream_info.duration)) {
  avalonPlayer.player.media.stop();
  advancePlaylist();
  }