X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2008d01336d019811fdb67b352ebfa4da5e43a45..fdb15fdd11d88b73900badf092cf2db0e8d3aabf:/lib/python/Plugins/Extensions/MediaPlayer/plugin.py

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index 06b6bfab..0de820c8 100644
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -717,7 +717,7 @@ def filescan_open(list, session, **kwargs):
 
 	mp.switchToPlayList()
 	for file in list:
-		ref = eServiceReference(4097, 0, file)
+		ref = eServiceReference(4097, 0, file.path)
 		mp.playlist.addFile(ref)
 
 	# TODO: rather play first than last file?
@@ -725,9 +725,7 @@ def filescan_open(list, session, **kwargs):
 	mp.playlist.updateList()
 
 def filescan(**kwargs):
-	# we expect not to be called if the MediaScanner plugin is not available,
-	# thus we don't catch an ImportError exception here
-	from Plugins.Extensions.MediaScanner.plugin import Scanner, ScanPath
+	from Components.Scanner import Scanner, ScanPath
 	return [
 		Scanner(mimetypes = ["video/mpeg"],
 			paths_to_scan =