Merge branch 'master' of http://github.com/trueos/lumina

2 files changed, 7 insertions, 7 deletions

diff --git a/mkport.sh b/mkport.sh
index 85d038ab..fac09073 100755
--- a/mkport.sh
+++ b/mkport.sh
@@ -4,7 +4,7 @@
 
 # Set the port
 dfile="lumina"
-VERSION="1.3.0"
+VERSION="1.3.1"
 
 massage_subdir() {
   cd "$1"
diff --git a/src-qt5/desktop-utils/lumina-fm/Browser.cpp b/src-qt5/desktop-utils/lumina-fm/Browser.cpp
index adfe6162..f2bdc178 100644
--- a/src-qt5/desktop-utils/lumina-fm/Browser.cpp
+++ b/src-qt5/desktop-utils/lumina-fm/Browser.cpp
@@ -97,13 +97,13 @@ void Browser::futureFinished(QString name, QImage icon){
      QIcon ico;
      //LFileInfo info(name);
      LFileInfo *info = new LFileInfo(name);
-      if(!icon.isNull()){
+      if(!icon.isNull() && showThumbs){
         //qDebug() << " -- Data:";
         QPixmap pix = QPixmap::fromImage(icon);
         ico.addPixmap(pix);
-       }else if(info->isDir()){
+       //}else if(info->isDir()){
         //qDebug() << " -- Folder:";
-        ico = loadIcon("folder");
+        //ico = loadIcon("folder");
       }
       if(ico.isNull()){
 	//qDebug() << " -- MimeType:" << info.fileName() << info.mimetype();
@@ -141,12 +141,12 @@ void Browser::loadDirectory(QString dir){
       QString path = directory.absoluteFilePath(files[i]);
       if(old.contains(path)){ old.removeAll(path); }
       oldFiles << path; //add to list for next time
-      if(showThumbs && imageFormats.contains(path.section(".",-1).toLower())){
+      //if(showThumbs && imageFormats.contains(path.section(".",-1).toLower())){
         QtConcurrent::run(this, &Browser::loadItem, path, this);
-      }else{
+      /*}else{
         //No special icon loading - just skip the file read step
         futureFinished(path, QImage()); //loadItem(path, this);
-      }
+      }*/
     }
     watcher->addPath(directory.absolutePath());
     if(!old.isEmpty()){