From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 15 Apr 2009 19:07:42 +0000 (+0200)
Subject: Mediaplayer/plugin.py: fix startup at first boot (thx to
X-Git-Tag: 2.6.0~336^2~4
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/3c4c841653efd2d173c5cda9f92217c606be108c

Mediaplayer/plugin.py: fix startup at first boot (thx to
Mike Looijmans)
---

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index b0aa6274..0f46c996 100644
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -21,7 +21,6 @@ from Components.Harddisk import harddiskmanager
 from Components.config import config
 from Tools.Directories import fileExists, pathExists, resolveFilename, SCOPE_CONFIG, SCOPE_PLAYLIST, SCOPE_SKIN_IMAGE
 from settings import MediaPlayerSettings
-from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier
 import random
 
 class MyPlayList(PlayList):
@@ -137,6 +136,8 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 		self["repeat"] = MultiPixmap()
 
 		self.seek_target = None
+
+		from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier
 		hotplugNotifier.append(self.hotplugCB)
 
 		class MoviePlayerActionMap(NumberActionMap):
@@ -244,6 +245,7 @@ class MediaPlayer(Screen, InfoBarBase, InfoBarSeek, InfoBarAudioSelection, InfoB
 		if config.mediaplayer.saveDirOnExit.getValue():
 			config.mediaplayer.defaultDir.setValue(self.filelist.getCurrentDirectory())
 			config.mediaplayer.defaultDir.save()
+		from Plugins.SystemPlugins.Hotplug.plugin import hotplugNotifier
 		hotplugNotifier.remove(self.hotplugCB)
 		del self["coverArt"].picload
 		self.close()