From e6e6eeb7c025682d1bfb0d32fba72c068b94bf91 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sun, 24 Jan 2010 15:18:26 +0000
Subject: [PATCH] Media and Blank screen now play together nicely.

---
 openlp/core/ui/maindisplay.py     | 2 ++
 openlp/core/ui/slidecontroller.py | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openlp/core/ui/maindisplay.py b/openlp/core/ui/maindisplay.py
index 7b73ab2ac..a4ff53567 100644
--- a/openlp/core/ui/maindisplay.py
+++ b/openlp/core/ui/maindisplay.py
@@ -298,6 +298,7 @@ class MainDisplay(DisplayWidget):
         log.debug(u'Play the new media, Live ')
         if not self.mediaLoaded and not self.displayBlank:
             self.blankDisplay()
+            self.display_frame = self.blankFrame
         self.firstTime = True
         self.mediaLoaded = True
         self.display.hide()
@@ -326,3 +327,4 @@ class MainDisplay(DisplayWidget):
         self.mediaLoaded = False
         self.video.setVisible(False)
         self.display.show()
+        self.blankDisplay(False)
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index e42dbc7f5..97bd406d3 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -441,7 +441,6 @@ class SlideController(QtGui.QWidget):
                         self.SongMenu.menu().addAction(self.trUtf8(u'%s'%tag),
                             self.onSongBarHandler)
                 item.setText(frame[u'text'])
-                #print {u'x':frame[u'text']}
             else:
                 label = QtGui.QLabel()
                 label.setMargin(4)
@@ -493,7 +492,6 @@ class SlideController(QtGui.QWidget):
         """
         Blank the screen.
         """
-        print "Button Pressed", blanked
         if self.serviceItem is not None:
             if self.serviceItem.is_command():
                 if blanked: