Merge branch 'master' of git.opendreambox.org:/git/enigma2

[enigma2.git] / 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 aeca12dc0e67a84b8ef73de04a83c650c62b0830..05adb633fe1d16c2a9a4828f2aca5c05a1738e14 100644 (file)
--- a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
@@ -1,7 +1,7 @@
 from enigma import ePicLoad, eTimer, getDesktop
 
 from Screens.Screen import Screen
-from Tools.Directories import resolveFilename, pathExists, SCOPE_MEDIA
+from Tools.Directories import resolveFilename, pathExists, fileExists, SCOPE_MEDIA
 from Plugins.Plugin import PluginDescriptor
 
 from Components.Pixmap import Pixmap, MovingPixmap
@@ -91,8 +91,9 @@ class picshow(Screen):
                
        def showThumb(self):
                if not self.filelist.canDescent():
-                       if self.picload.getThumbnail(self.filelist.getCurrentDirectory() + self.filelist.getFilename()) == 1:
-                               self.ThumbTimer.start(500, True)
+                       if self.filelist.getCurrentDirectory() and self.filelist.getFilename():
+                               if self.picload.getThumbnail(self.filelist.getCurrentDirectory() + self.filelist.getFilename()) == 1:
+                                       self.ThumbTimer.start(500, True)
 
        def selectionChanged(self):
                if not self.filelist.canDescent():
@@ -451,6 +452,11 @@ class Pic_Full_View(Screen):
                                        self.filelist.append(path + x[0][0])
                                else:
                                        self.dirlistcount += 1
+                       elif len(filelist[0]) == 2: #scanlist
+                               if x[0][1] == False:
+                                       self.filelist.append(x[0][0])
+                               else:
+                                       self.dirlistcount += 1
                        else: # thumbnaillist
                                self.filelist.append(x[T_FULL])