From cf62d6187f75353e41d4a7ca5653fc2f38ef98cf Mon Sep 17 00:00:00 2001
From: Jonathan Corwin <j@corwin.co.uk>
Date: Wed, 17 Feb 2010 22:57:59 +0000
Subject: [PATCH] More presentation fixes/tidies

---
 .../presentations/lib/impresscontroller.py    |  6 +++---
 .../presentations/lib/messagelistener.py      | 20 ++++++++-----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py
index b58a9affc..31b3ac5f6 100644
--- a/openlp/plugins/presentations/lib/impresscontroller.py
+++ b/openlp/plugins/presentations/lib/impresscontroller.py
@@ -201,7 +201,7 @@ class ImpressController(PresentationController):
             try:
                 ctx = resolver.resolve(u'uno:socket,host=localhost,port=2002;urp;StarOffice.ComponentContext')
             except:
-                log.exception(u'Unable to fine running instance ')
+                log.exception(u'Unable to find running instance ')
                 self.start_process()
                 loop += 1
         try:
@@ -233,8 +233,8 @@ class ImpressController(PresentationController):
     def close_presentation(self):
         """
         Close presentation and clean up objects
-        Triggerent by new object being added to SlideController orOpenLP
-        being shut down
+        Triggered by new object being added to SlideController or OpenLP
+        being shutdown
         """
         log.debug(u'close Presentation OpenOffice')
         if self.document:
diff --git a/openlp/plugins/presentations/lib/messagelistener.py b/openlp/plugins/presentations/lib/messagelistener.py
index 0b2fd6003..3c665004b 100644
--- a/openlp/plugins/presentations/lib/messagelistener.py
+++ b/openlp/plugins/presentations/lib/messagelistener.py
@@ -67,8 +67,8 @@ class Controller(object):
 
     def slide(self, slide, live):
         log.debug(u'Live = %s, slide' % live)
-#        if not isLive:
-#            return
+        if not live:
+            return
         self.activate()
         self.controller.goto_slide(int(slide) + 1)
         self.controller.poll_slidenumber(live)
@@ -136,11 +136,13 @@ class Controller(object):
         self.controller.blank_screen()
 
     def unblank(self):
-        if not self.is_live:
+        if not self.isLive:
             return
         self.activate()
         self.controller.unblank_screen()
 
+    def poll(self):
+        self.controller.poll_slidenumber(self.isLive)
 
 class MessageListener(object):
     """
@@ -229,16 +231,10 @@ class MessageListener(object):
             self.previewHandler.shutdown()
 
     def blank(self):
-        if self.isLive:
-            self.liveHandler.blank()
-        else:
-            self.previewHandler.blank()
+        self.liveHandler.blank()
 
     def unblank(self):
-        if self.isLive:
-            self.liveHandler.unblank()
-        else:
-            self.previewHandler.unblank()
+        self.liveHandler.unblank()
 
     def splitMessage(self, message):
         """
@@ -263,4 +259,4 @@ class MessageListener(object):
         return message[0], file, message[4]
 
     def timeout(self):
-        self.controller.poll_slidenumber(self.is_live)
+        self.liveHandler.poll()