OpenLP

Merge lp:~crichter/openlp/bug-899665 into lp:openlp

  1. bug-899665
  2. Merge into trunk
Proposed by rimach
Status: Merged
Approved by: Raoul Snyman
Approved revision: 1825
Merged at revision: 1826
Proposed branch: lp:~crichter/openlp/bug-899665
Merge into: lp:openlp
Diff against target: 19 lines (+7/-2)
1 file modified
openlp/core/ui/media/mediacontroller.py (+7/-2)
To merge this branch: bzr merge lp:~crichter/openlp/bug-899665
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tim Bentley Approve
Review via email: mp+84684@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) :
review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
311 isValid = self.check_file_type(controller, display)311 isValid = self.check_file_type(controller, display)
312 display.override[u'theme'] = u''312 display.override[u'theme'] = u''
313 display.override[u'video'] = True313 display.override[u'video'] = True
314 controller.media_info.start_time = display.serviceItem.start_time314 if controller.media_info.is_background:
315 controller.media_info.end_time = display.serviceItem.end_time315 # ignore start/end time
316 controller.media_info.start_time = 0
317 controller.media_info.end_time = 0
318 else:
319 controller.media_info.start_time = display.serviceItem.start_time
320 controller.media_info.end_time = display.serviceItem.end_time
316 elif controller.previewDisplay:321 elif controller.previewDisplay:
317 display = controller.previewDisplay322 display = controller.previewDisplay
318 isValid = self.check_file_type(controller, display)323 isValid = self.check_file_type(controller, display)