Presentation display fixes

openlp/core/ui/maindisplay.py

@@ -236,7 +236,7 @@ class MainDisplay(DisplayWidget):
         """
         log.debug(u'display alert called %s' % text)
         self.alertList.append(text)
-        if self.timer_id != 0:
+        if self.timer_id != 0 or self.mediaLoaded:
             return
         self.generateAlert()
 
@@ -299,6 +299,7 @@ class MainDisplay(DisplayWidget):
         self.firstTime = True
         self.mediaLoaded = True
         self.display.hide()
+        self.alertDisplay.hide()
         self.video.setFullScreen(True)
         self.video.setVisible(True)
         self.mediaObject.play()

openlp/core/ui/slidecontroller.py

@@ -493,6 +493,7 @@ class SlideController(QtGui.QWidget):
         """
         Blank the screen.
         """
+        print "onbl", blanked
         if self.serviceItem is not None:
             if self.serviceItem.is_command():
                 if blanked:
@@ -550,7 +551,7 @@ class SlideController(QtGui.QWidget):
     def grabMainDisplay(self):
         rm = self.parent.RenderManager
         winid = QtGui.QApplication.desktop().winId()
-        rect = rm.screen_list[rm.current_display][u'size']
+        rect = rm.screens.current[u'size']
         winimg = QtGui.QPixmap.grabWindow(winid, rect.x(),
             rect.y(), rect.width(), rect.height())
         self.SlidePreview.setPixmap(winimg)
@@ -666,7 +667,7 @@ class SlideController(QtGui.QWidget):
 
     def onMediaStop(self):
         if self.isLive:
-            Receiver.send_message(u'%s_stop'% self.serviceItem.name.lower())
+            Receiver.send_message(u'%s_stop'% self.serviceItem.name.lower(), self.isLive)
         else:
             self.mediaObject.stop()
             self.video.hide()

openlp/plugins/presentations/lib/impresscontroller.py

@@ -232,13 +232,13 @@ class ImpressController(PresentationController):
         """
         if self.document:
             if self.presentation:
-                self.presentation.end()
-                self.presentation = None
-            try:
-                self.document.dispose()
-            except:
-                #We tried!
-                pass
+                try:
+                    self.presentation.end()
+                    self.presentation = None
+                    self.document.dispose()
+                except:
+                    #We tried!
+                    pass
             self.document = None
 
     def is_loaded(self):