X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/22284d888f6eac661e4485ede53ca193f5ac248d..fdb15fdd11d88b73900badf092cf2db0e8d3aabf:/lib/python/Plugins/Extensions/PicturePlayer/plugin.py

diff --git a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
index 4462df13..b6699bab 100644
--- a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
@@ -531,14 +531,14 @@ def main(session, **kwargs):
 	session.open(picmain)
 
 def filescan_open(list, session, **kwargs):
-	session.open(picmain) # list
+	# Recreate List as expected by PicView
+	filelist = [((file.path, False), None) for file in list]
+	session.open(PicView, filelist, "", "")
 
 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(extensions = ["jpg", "jpe", "jpeg"], 
+		Scanner(mimetypes = ["image/jpeg", "image/png", "image/gif", "image/bmp"],
 			paths_to_scan = 
 				[
 					ScanPath(path = "DCIM", with_subdirs = True),