diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2008-11-20 01:17:48 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2008-11-20 01:17:48 +0100 |
| commit | a4c061ed8e7ec8355a3b2f972ac5a4ee33cc7c25 (patch) | |
| tree | 2b5c6d5a204ce2613e071a8f792137ba2ba65b3f /lib/python/Plugins/Extensions/PicturePlayer/plugin.py | |
| parent | d8cbf1fa62da972b6a86c6f56ee2bbafb072f0cb (diff) | |
| parent | a4215a0c375de7d1c0482ca796d20cbb54ac105f (diff) | |
| download | enigma2-a4c061ed8e7ec8355a3b2f972ac5a4ee33cc7c25.tar.gz enigma2-a4c061ed8e7ec8355a3b2f972ac5a4ee33cc7c25.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Plugins/Extensions/PicturePlayer/plugin.py')
| -rw-r--r-- | lib/python/Plugins/Extensions/PicturePlayer/plugin.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py index aeca12dc..05adb633 100644 --- 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]) |