From a58dc95f07116069706fa9235a2c635e8e872734 Mon Sep 17 00:00:00 2001
From: denise <denise@denise-DX4860.(none)>
Date: Fri, 13 Apr 2012 12:29:23 -0400
Subject: [PATCH] changed "current" label - not perfect

---
 airtime_mvc/public/js/airtime/dashboard/playlist.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/dashboard/playlist.js b/airtime_mvc/public/js/airtime/dashboard/playlist.js
index 34bd81eb0..bd47c06b1 100644
--- a/airtime_mvc/public/js/airtime/dashboard/playlist.js
+++ b/airtime_mvc/public/js/airtime/dashboard/playlist.js
@@ -148,11 +148,11 @@ function updatePlaybar(){
         else
             $('#current').text(currentSong.name+",");
     }else{
-        if (master_dj_on_air) {
-            $('#current').html("Current: <span style='color:red; font-weight:bold'>Master Stream</span>");
+		if (master_dj_on_air) {
+            $('#current').html("Current: <span style='color:red; font-weight:bold'>Master DJ On Air</span>");
+        } else if (scheduled_play_on_air) {
+			$('#current').html("Current: <span style='color:red; font-weight:bold'>Show DJ On Air</span>");
         } else if (live_dj_on_air) {
-            $('#current').html("Current: <span style='color:red; font-weight:bold'>"+currentShow.name+"</span>");
-        } else {
             $('#current').html("Current: <span style='color:red; font-weight:bold'>Nothing Scheduled</span>");
         }
     }