Merge pull request #438 from rdoeffinger/checkconfig

For config check, check that the selected binary is available.
IJHack · Dec 17, 2018 · c237352 · c237352
2 parents f3b41ae + 2f39223
commit c237352
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/util.cpp b/src/util.cpp
@@ -131,8 +131,9 @@ QString Util::findBinaryInPath(QString binary) {
 bool Util::checkConfig() {
   return !QFile(QDir(QtPassSettings::getPassStore()).filePath(".gpg-id"))
               .exists() ||
-         (!QtPassSettings::getPassExecutable().startsWith("wsl ") &&
-          !QFile(QtPassSettings::getPassExecutable()).exists() &&
+         (QtPassSettings::isUsePass() ?
+          !QtPassSettings::getPassExecutable().startsWith("wsl ") &&
+          !QFile(QtPassSettings::getPassExecutable()).exists() :
           !QtPassSettings::getGpgExecutable().startsWith("wsl ") &&
           !QFile(QtPassSettings::getGpgExecutable()).exists());
 }