From 8e6e43658903e1f95e3cb6ddc96c22736256f406 Mon Sep 17 00:00:00 2001
From: Patrick Fairbank <patrick@ooyala.com>
Date: Fri, 22 Aug 2014 20:59:29 -0700
Subject: [PATCH] Fixed alliance display to not show logo over display ID text.

---
 static/js/alliance_station_display.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/static/js/alliance_station_display.js b/static/js/alliance_station_display.js
index 314f26f..9b693b2 100644
--- a/static/js/alliance_station_display.js
+++ b/static/js/alliance_station_display.js
@@ -5,9 +5,16 @@
 
 var allianceStation = "";
 var blinkInterval;
+var currentScreen = "blank";
 var websocket;
 
 var handleSetAllianceStationDisplay = function(targetScreen) {
+  currentScreen = targetScreen;
+
+  if (allianceStation == "") {
+    // Don't show anything if this screen hasn't been assigned a position yet.
+    targetScreen = "blank";
+  }
   switch (targetScreen) {
     case "logo":
       $("#match").hide();
@@ -31,6 +38,7 @@ var handleSetMatch = function(data) {
   } else if (allianceStation != data.AllianceStation) {
     // The server knows better what display this should be; sync up.
     allianceStation = data.AllianceStation;
+    handleSetAllianceStationDisplay(currentScreen);
   }
 
   if (allianceStation != "") {