Bugfixes

1 files changed, 13 insertions, 4 deletions

diff --git a/client/js/radio_emulator.js b/client/js/radio_emulator.js
index ed6c58d..7064a5e 100644
--- a/client/js/radio_emulator.js
+++ b/client/js/radio_emulator.js
@@ -256,12 +256,13 @@ function listCallback(json, params)
     previous = { starts_on: -1 };
     if ( json.list.length === 1 )
     {
-        FetchJSON(`${jsonRequest}${previous.hash}`, loadShowCallback, [json, now_on_sequence, json.list[0], hash_of_list]);
+        FetchJSON(`${jsonRequest}${json.list[0].hash}`, loadShowCallback, [json, now_on_sequence, json.list[0], hash_of_list]);
     }
     for ( var i = 1; i < json.list.length; i++)
     {
         debugLog("getting there")
-        if ( now_on_sequence < json.list[i].starts_on && now_on_sequence > json.list[i-1].starts_on){
+        if ( now_on_sequence < json.list[i].starts_on && now_on_sequence > json.list[i-1].starts_on )
+        {
 
             var tmp = document.createElement('pre');
             tmp.innerText = JSON.stringify(json.list[i-1], null, 2);
@@ -270,17 +271,25 @@ function listCallback(json, params)
             debugLog(`now_on_sequence (1updated): ${now_on_sequence}`);
             previous = json.list[i-1];
             FetchJSON(`${jsonRequest}${previous.hash}`, loadShowCallback, [json, now_on_sequence, previous, hash_of_list]);
+            debugLog('First!');
             break;
         }
-        else
+        else if ( now_on_sequence > json.list[i].starts_on && now_on_sequence > json.list[i-1].starts_on )
         {
             var tmp = document.createElement('pre');
             tmp.innerText = JSON.stringify(json.list[i-1], null, 2);
             placeholders.previouslyPlayed.append(tmp);
+            FetchJSON(`${jsonRequest}${json.list[i].hash}`, loadShowCallback, [json, now_on_sequence, json.list[i], hash_of_list]);
+            debugLog('Second!');
+            break;
+        }
+        else
+        {
             debugLog(now_on_sequence);
             debugLog(json.list[i].starts_on);
-            FetchJSON(`${jsonRequest}${json.list[i].hash}`, loadShowCallback, [json, now_on_sequence, json.list[i], hash_of_list]);
             debugLog(json.list[i-1].starts_on);
+            debugLog('Nothing!');
+            continue;
         }
     }
 }