openlp-core team mailing list archive

[rimach <crichter@xxxxxx>]

rimach has proposed merging lp:~crichter/openlp/bug-899665 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~crichter/openlp/bug-899665/+merge/84684
-- 
https://code.launchpad.net/~crichter/openlp/bug-899665/+merge/84684
Your team OpenLP Core is requested to review the proposed merge of lp:~crichter/openlp/bug-899665 into lp:openlp.

=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py	2011-12-03 20:35:53 +0000
+++ openlp/core/ui/media/mediacontroller.py	2011-12-06 21:46:32 +0000
@@ -311,8 +311,13 @@
             isValid = self.check_file_type(controller, display)
             display.override[u'theme'] = u''
             display.override[u'video'] = True
-            controller.media_info.start_time = display.serviceItem.start_time
-            controller.media_info.end_time = display.serviceItem.end_time
+            if controller.media_info.is_background:
+                # ignore start/end time
+                controller.media_info.start_time = 0
+                controller.media_info.end_time = 0
+            else:
+                controller.media_info.start_time = display.serviceItem.start_time
+                controller.media_info.end_time = display.serviceItem.end_time
         elif controller.previewDisplay:
             display = controller.previewDisplay
             isValid = self.check_file_type(controller, display)