← Back to branch summary

~openlp-core/openlp/trunk

« back to all changes in this revision

Viewing changes to openlp/core/ui/media/mediacontroller.py

  • Committer: Raoul Snyman
  • Author(s): Christian Richter
  • Date: 2011-12-08 20:27:22 UTC
  • mfrom: (1824.1.1 bug-899665)
  • Revision ID: raoul.snyman@saturnlaboratories.co.za-20111208202722-mrt6xmfzsslvhlds
https://launchpad.net/bugs/899665
Fixed a traceback when replaying live video background when no service item has been sent live before.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openlp/core/ui/media/mediacontroller.py
311
311
            isValid = self.check_file_type(controller, display)
312
312
            display.override[u'theme'] = u''
313
313
            display.override[u'video'] = True
314
 
            controller.media_info.start_time = display.serviceItem.start_time
315
 
            controller.media_info.end_time = display.serviceItem.end_time
 
314
            if controller.media_info.is_background:
 
315
                # 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
321
        elif controller.previewDisplay:
317
322
            display = controller.previewDisplay
318
323
            isValid = self.check_file_type(controller, display)