From 98c5dd4865807a9a37d74ea62c8c2ae8edb6caa9 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Fri, 26 Dec 2014 17:45:34 +0000 Subject: [PATCH] Fix bug 1405476 by checking if an end_time has been set. Fixes: https://launchpad.net/bugs/1405476 --- openlp/core/ui/media/mediacontroller.py | 2 ++ openlp/core/ui/starttimeform.py | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/openlp/core/ui/media/mediacontroller.py b/openlp/core/ui/media/mediacontroller.py index e3517ba0f..8714845b8 100644 --- a/openlp/core/ui/media/mediacontroller.py +++ b/openlp/core/ui/media/mediacontroller.py @@ -217,6 +217,8 @@ class MediaController(RegistryMixin, OpenLPMixin, RegistryProperties): if self.current_media_players[source].state != MediaState.Paused: display = self._define_display(self.display_controllers[source]) display.controller.seek_slider.setSliderPosition(0) + display.controller.mediabar.actions['playbackPlay'].setVisible(True) + display.controller.mediabar.actions['playbackPause'].setVisible(False) self.timer.stop() def get_media_display_css(self): diff --git a/openlp/core/ui/starttimeform.py b/openlp/core/ui/starttimeform.py index d005d167b..44cb1e3a4 100644 --- a/openlp/core/ui/starttimeform.py +++ b/openlp/core/ui/starttimeform.py @@ -56,7 +56,9 @@ class StartTimeForm(QtGui.QDialog, Ui_StartTimeDialog, RegistryProperties): self.hour_spin_box.setValue(hour) self.minute_spin_box.setValue(minutes) self.second_spin_box.setValue(seconds) - hours, minutes, seconds = self._time_split(self.item['service_item'].media_length) + hours, minutes, seconds = self._time_split(self.item['service_item'].end_time) + if hours == 0 and minutes == 0 and seconds == 0: + hours, minutes, seconds = self._time_split(self.item['service_item'].media_length) self.hour_finish_spin_box.setValue(hours) self.minute_finish_spin_box.setValue(minutes) self.second_finish_spin_box.setValue(seconds)