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 e9da3e2fe3c49a949e6b7d5acdd8ff296a7bfe40..10e4e514adc19a7856c6dd9c18e9f8b092cc902d 100644 (file)
--- a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
@@ -452,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])
 
@@ -581,7 +586,7 @@ def filescan(**kwargs):
                                        ScanPath(path = "", with_subdirs = False),
                                ],
                        name = "Pictures", 
-                       description = "View Photos...",
+                       description = _("View Photos..."),
                        openfnc = filescan_open,
                )