From e48b2f2a8466b2cac3dfcf74951b14cfd73ed341 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Wed, 30 May 2012 12:46:05 -0400
Subject: [PATCH] CC-3913: Live Stream: When master switch is turned on, it
 turns off show switch

- fixed
---
 airtime_mvc/public/js/airtime/dashboard/dashboard.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/airtime_mvc/public/js/airtime/dashboard/dashboard.js b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
index 5e3fdca72..4f2293514 100644
--- a/airtime_mvc/public/js/airtime/dashboard/dashboard.js
+++ b/airtime_mvc/public/js/airtime/dashboard/dashboard.js
@@ -276,7 +276,7 @@ function parseSourceStatus(obj){
 
 function parseSwitchStatus(obj){
     
-    if(obj.live_dj_source == "on" && obj.master_dj_source == "off"){
+    if(obj.live_dj_source == "on"){
         live_dj_on_air = true;
     }else{
         live_dj_on_air = false;
@@ -398,7 +398,6 @@ function setSwitchListener(ele){
     var sourcename = $(ele).attr('id');
     var status_span = $(ele).find("span");
     var status = status_span.html();
-    
     $.get("/Dashboard/switch-source/format/json/sourcename/"+sourcename+"/status/"+status, function(data){
         if(data.error){
             alert(data.error);