From f60f8d211bfb984b74430ab53959d4cdb56f5361 Mon Sep 17 00:00:00 2001
From: Ken Roberts <alisonken1@juno.com>
Date: Wed, 15 Oct 2014 13:53:17 -0700
Subject: [PATCH] Fix source select when sources not known yet

---
 openlp/core/lib/projector/pjlink1.py | 14 ++++++++++----
 openlp/core/ui/projector/manager.py  |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/openlp/core/lib/projector/pjlink1.py b/openlp/core/lib/projector/pjlink1.py
index 7ed8f3687..6cf50cb07 100644
--- a/openlp/core/lib/projector/pjlink1.py
+++ b/openlp/core/lib/projector/pjlink1.py
@@ -475,17 +475,17 @@ class PJLink1(QTcpSocket):
             return
         if data is not None:
             out = data
-            log.debug('(%s) _send_string(data=%s)' % (self.ip, out))
+            log.debug('(%s) _send_string(data=%s)' % (self.ip, out.strip()))
         elif len(self.send_queue) != 0:
             out = self.send_queue.pop(0)
-            log.debug('(%s) _send_string(queued data=%s)' % (self.ip, out))
+            log.debug('(%s) _send_string(queued data=%s)' % (self.ip, out.strip()))
         else:
             # No data to send
             log.debug('(%s) _send_string(): No data to send' % self.ip)
             self.send_busy = False
             return
         self.send_busy = True
-        log.debug('(%s) _send_string(): Sending "%s"' % (self.ip, out))
+        log.debug('(%s) _send_string(): Sending "%s"' % (self.ip, out.strip()))
         log.debug('(%s) _send_string(): Queue = %s' % (self.ip, self.send_queue))
         try:
             self.projectorNetwork.emit(S_NETWORK_SENDING)
@@ -550,7 +550,12 @@ class PJLink1(QTcpSocket):
         lamps = []
         data_dict = data.split()
         while data_dict:
-            fill = {'Hours': int(data_dict[0]), 'On': False if data_dict[1] == '0' else True}
+            try:
+                fill = {'Hours': int(data_dict[0]), 'On': False if data_dict[1] == '0' else True}
+            except ValueError:
+                # In case of invalid entry
+                log.warn('(%s) process_lamp(): Invalid data "%s"' %( self.ip, data))
+                return
             lamps.append(fill)
             data_dict.pop(0)  # Remove lamp hours
             data_dict.pop(0)  # Remove lamp on/off
@@ -653,6 +658,7 @@ class PJLink1(QTcpSocket):
         for source in check:
             sources.append(source)
         self.source_available = sources
+        self.projectorUpdateIcons.emit()
         return
 
     def process_erst(self, data):
diff --git a/openlp/core/ui/projector/manager.py b/openlp/core/ui/projector/manager.py
index aa3299e7a..9330b66f3 100644
--- a/openlp/core/ui/projector/manager.py
+++ b/openlp/core/ui/projector/manager.py
@@ -841,7 +841,8 @@ class ProjectorManager(OpenLPMixin, RegistryMixin, QtGui.QWidget, Ui_ProjectorMa
             power = projector.link.power == S_ON
             if connected:
                 self.get_toolbar_item('view_projector', enabled=True)
-                self.get_toolbar_item('source_projector', enabled=connected & power)
+                self.get_toolbar_item('source_projector',
+                                      enabled=connected and power and projector.link.source_available is not None)
                 self.get_toolbar_item('edit_projector', hidden=True)
                 self.get_toolbar_item('delete_projector', hidden=True)
             else: