From 8761117d341e7ce41c3ecb364dbe82aa7c34c4dc Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Wed, 3 Apr 2013 12:19:15 +0200 Subject: [PATCH] fixed fixme: constructor --- openlp/core/lib/settingstab.py | 6 ++---- openlp/core/ui/media/playertab.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/openlp/core/lib/settingstab.py b/openlp/core/lib/settingstab.py index 8bdc60cbb..99b862958 100644 --- a/openlp/core/lib/settingstab.py +++ b/openlp/core/lib/settingstab.py @@ -184,10 +184,8 @@ class SettingsTab(QtGui.QWidget): """ Adds the media controller to the class dynamically """ -# if not hasattr(self, '_media_controller'): -# self._media_controller = Registry().get('media_controller') - # FIXME: python3 - self._media_controller = Registry().get('media_controller') + if not hasattr(self, '_media_controller'): + self._media_controller = Registry().get('media_controller') return self._media_controller media_controller = property(_get_media_controller) diff --git a/openlp/core/ui/media/playertab.py b/openlp/core/ui/media/playertab.py index 1c61a5545..3331c70ca 100644 --- a/openlp/core/ui/media/playertab.py +++ b/openlp/core/ui/media/playertab.py @@ -55,7 +55,7 @@ class PlayerTab(SettingsTab): """ Constructor """ - self.media_players = self.media_controller.media_players + self.media_players = Registry().get('media_controller').media_players self.saved_used_players = None self.icon_path = u':/media/multimedia-player.png' player_translated = translate('OpenLP.PlayerTab', 'Players')