openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bug-780095 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #780095 in OpenLP: "audio/video isn't paused if going from preview to live from preview"
  https://bugs.launchpad.net/openlp/+bug/780095

For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-780095/+merge/61732

If moving from Preview to Live via a double click stop the preview so Live has control.
-- 
https://code.launchpad.net/~trb143/openlp/bug-780095/+merge/61732
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bug-780095 into lp:openlp.

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2011-05-15 10:38:11 +0000
+++ openlp/core/ui/slidecontroller.py	2011-05-20 10:10:38 +0000
@@ -1050,7 +1050,15 @@
         """
         if QtCore.QSettings().value(u'advanced/double click live',
             QtCore.QVariant(False)).toBool():
-            self.onGoLive()
+                # Live and Preview have issues if we have video or presentations
+                # playing in both at the same time.
+                if self.serviceItem.is_command():
+                    Receiver.send_message(u'%s_stop' %
+                        self.serviceItem.name.lower(),
+                        [self.serviceItem, self.isLive])
+                if self.serviceItem.is_media():
+                    self.onMediaClose()
+                self.onGoLive()
 
     def onGoLive(self):
         """