forked from openlp/openlp
bugfixing
This commit is contained in:
parent
ae5998e2dc
commit
2df4a1903e
@ -311,8 +311,12 @@ class MediaController(object):
|
||||
isValid = self.check_file_type(controller, display)
|
||||
display.override[u'theme'] = u''
|
||||
display.override[u'video'] = True
|
||||
if not controller.media_info.is_background:
|
||||
controller.media_info.start_time = display.serviceItem.start_time
|
||||
controller.media_info.end_time = display.serviceItem.end_time
|
||||
else:
|
||||
controller.media_info.start_time = 0
|
||||
controller.media_info.end_time = 0
|
||||
elif controller.previewDisplay:
|
||||
display = controller.previewDisplay
|
||||
isValid = self.check_file_type(controller, display)
|
||||
|
@ -31,7 +31,7 @@ from datetime import datetime
|
||||
try:
|
||||
import vlc
|
||||
vlc_available = bool(vlc.get_default_instance())
|
||||
except ImportError:
|
||||
except (ImportError, WindowsError):
|
||||
vlc_available = False
|
||||
|
||||
from PyQt4 import QtCore, QtGui
|
||||
|
Loading…
Reference in New Issue
Block a user