cc-2344: wrong song displayed

-fixed

airtime_mvc/application/models/Schedule.php

@@ -397,12 +397,20 @@ class Schedule {
     public static function GetCurrentScheduleItem($p_timeNow){
         global $CC_CONFIG, $CC_DBC;
 
+        /* Note that usually there will be one result returned. In some
+         * rare cases two songs are returned. This happens when a track
+         * that was overbooked from a previous show appears as if it
+         * hasnt ended yet (track end time hasn't been reached yet). For
+         * this reason,  we need to get the track that starts later, as
+         * this is the *real* track that is currently playing. So this
+         * is why we are ordering by track start time. */
         $sql = "SELECT *"
         ." FROM $CC_CONFIG[scheduleTable] st"
         ." LEFT JOIN $CC_CONFIG[filesTable] ft"
         ." ON st.file_id = ft.id"
         ." WHERE st.starts <= TIMESTAMP '$p_timeNow'"
         ." AND st.ends > TIMESTAMP '$p_timeNow'"
+        ." ORDER BY st.starts DESC"
         ." LIMIT 1";
 
         $row = $CC_DBC->GetAll($sql);