From 2310c24f26880e6cb1bddd7e2ba6e945acd68c9f Mon Sep 17 00:00:00 2001 From: martin Date: Sun, 30 Jan 2011 17:27:58 -0500 Subject: [PATCH] CC-1823 definitely fixed now. --- public/js/playlist/playlist.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/public/js/playlist/playlist.js b/public/js/playlist/playlist.js index 62d5a6ba6..1786a32f5 100644 --- a/public/js/playlist/playlist.js +++ b/public/js/playlist/playlist.js @@ -1,6 +1,6 @@ var estimatedSchedulePosixTime = -1; -var localRemoteTimeOffset; +var localRemoteTimeOffset = -1; var previousSongs = new Array(); var currentSong = new Array(); @@ -53,8 +53,10 @@ function getTrackInfo(song){ function secondsTimer(){ var date = new Date(); - estimatedSchedulePosixTime = date.getTime() - localRemoteTimeOffset; + if (localRemoteTimeOffset != -1) + estimatedSchedulePosixTime = date.getTime() - localRemoteTimeOffset; updateProgressBarValue(); + } function updateGlobalValues(obj){ @@ -204,7 +206,7 @@ function parseItems(obj){ function getScheduleFromServer(){ $.ajax({ url: "/Schedule/get-current-playlist/format/json", dataType:"json", success:function(data){ - parseItems(data.entries); + parseItems(data.entries); }}); setTimeout(getScheduleFromServer, serverUpdateInterval); }