runner: Always select the command first and don't match directories

0f0168946dd31e73cd#L0R140
Razor-qt · Sep 23, 2012 · 1eed850 · 1eed850
1 parent 625cb57
commit 1eed850
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/razorqt-runner/commanditemmodel.cpp b/razorqt-runner/commanditemmodel.cpp
@@ -143,7 +143,7 @@ QModelIndex CommandItemModel::appropriateItem(const QString &pattern) const
         QModelIndex ind = index(i,0);
         QModelIndex srcIndex = mapToSource(ind);
         if (srcIndex == mSourceModel->customCommandIndex())
-            continue;
+            return ind;
 
         const CommandProviderItem *item = mSourceModel->command(srcIndex);
         if (!item)

diff --git a/razorqt-runner/providers.cpp b/razorqt-runner/providers.cpp
@@ -410,16 +410,18 @@ QString which(const QString &progName)
 
     if (progName.startsWith(QDir::separator()))
     {
-        if (QFileInfo(progName).isExecutable())
-            QFileInfo(progName).absoluteFilePath();
+        QFileInfo fileInfo(progName);
+        if (fileInfo.isExecutable() && fileInfo.isFile())
+            return fileInfo.absoluteFilePath();
     }
 
     QStringList dirs = QString(getenv("PATH")).split(":");
 
     foreach (QString dir, dirs)
     {
-        if (QFileInfo(QDir(dir), progName).isExecutable())
-            return QFileInfo(QDir(dir), progName).absoluteFilePath();
+        QFileInfo fileInfo(QDir(dir), progName);
+        if (fileInfo.isExecutable() && fileInfo.isFile())
+            return fileInfo.absoluteFilePath();
     }
 
     return "";