1 files changed, 13 insertions, 12 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index b224deb..f4ca349 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -315,23 +315,24 @@ void AdvancedFm::populateLocalView()
                 
                 if( !QDir( fi->filePath() ).isReadable()) //is directory
                     pm = Resource::loadPixmap( "lockedfolder" );
                 else
                     pm= Resource::loadPixmap( "folder" );
 //                 item->setPixmap( 0,pm );
+            } else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+                pm = Resource::loadPixmap( "exec");
             } else if( (fileInfo.permission( QFileInfo::ExeUser)
-                     | fileInfo.permission( QFileInfo::ExeGroup)
-                       | fileInfo.permission( QFileInfo::ExeOther))
-                       | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
-                    pm = Resource::loadPixmap( "exec");
+                        | fileInfo.permission( QFileInfo::ExeGroup)
+                        | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
+                pm = Resource::loadPixmap( "exec");
 //                 else { //is exec
 //                  pm = Resource::loadPixmap( "exec");
 //                 }
 // //                 item->setPixmap( 0,pm);
-            } else if( !fi->isReadable() ) { 
-                pm = Resource::loadPixmap( "locked" );
+        } else if( !fi->isReadable() ) { 
+            pm = Resource::loadPixmap( "locked" );
 //                 item->setPixmap( 0,pm);
             } else { //everything else goes by mimetype
                 MimeType mt(fi->filePath());
                 pm=mt.pixmap(); //sets the correct pixmap for mimetype
                 if(pm.isNull())
                     pm =  Resource::loadPixmap( "UnknownDocument-14" );
@@ -427,29 +428,29 @@ void AdvancedFm::populateRemoteView()
             if( QDir(QDir::cleanDirPath( currentRemoteDir.canonicalPath()+"/"+fileL)).exists() ) {
                 fileL+="/";
                 isDir=TRUE;
 //     qDebug( fileL);
             }
         }
-        QFileInfo fileInfo(  currentDir.canonicalPath()+"/"+fileL);
+        QFileInfo fileInfo(  currentRemoteDir.canonicalPath()+"/"+fileL);
         if(fileL !="./" && fi->exists()) {
             item= new QListViewItem( Remote_View, fileL, fileS, fileDate);
             QPixmap pm;
 
             if(isDir || fileL.find("/",0,TRUE) != -1) {
                 if( !QDir( fi->filePath() ).isReadable())
                     pm = Resource::loadPixmap( "lockedfolder" );
                 else
                     pm= Resource::loadPixmap( "folder" );
 //                 item->setPixmap( 0,pm );
+            } else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+                pm = Resource::loadPixmap( "exec");
             } else if( (fileInfo.permission( QFileInfo::ExeUser)
-                     | fileInfo.permission( QFileInfo::ExeGroup)
-                       | fileInfo.permission( QFileInfo::ExeOther))
-                       | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
-/////                }  else if(fileInfo.isExecutable()){ //is exec <<<< BROKEN!!
-                  pm = Resource::loadPixmap( "exec");
+                        | fileInfo.permission( QFileInfo::ExeGroup)
+                        | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
+                pm = Resource::loadPixmap( "exec");
 //                     item->setPixmap( 0,pm);
             } else if( !fi->isReadable() ) {
                 pm = Resource::loadPixmap( "locked" );
 //                     item->setPixmap( 0,pm);
             } else {
                 MimeType mt(fi->filePath());