Fixing binary paths array wrongly iterated up to binaryPaths->length() (#216)

This commit is contained in:
Dmitry Mikushin 2023-02-17 05:08:09 +01:00 committed by GitHub
parent 8ca2610550
commit bffc5d733b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 11 deletions

View File

@ -34,9 +34,9 @@ GPService::~GPService()
QString GPService::findBinary() QString GPService::findBinary()
{ {
for (int i = 0; i < binaryPaths->length(); i++) { for (auto& binaryPath : binaryPaths) {
if (QFileInfo::exists(binaryPaths[i])) { if (QFileInfo::exists(binaryPath)) {
return binaryPaths[i]; return binaryPath;
} }
} }
return nullptr; return nullptr;

View File

@ -4,14 +4,13 @@
#include <QtCore/QObject> #include <QtCore/QObject>
#include <QtCore/QProcess> #include <QtCore/QProcess>
static const QString binaryPaths[] { static QList<QString> binaryPaths = QList<QString>() <<
"/usr/local/bin/openconnect", "/usr/local/bin/openconnect" <<
"/usr/local/sbin/openconnect", "/usr/local/sbin/openconnect" <<
"/usr/bin/openconnect", "/usr/bin/openconnect" <<
"/usr/sbin/openconnect", "/usr/sbin/openconnect" <<
"/opt/bin/openconnect", "/opt/bin/openconnect" <<
"/opt/sbin/openconnect" "/opt/sbin/openconnect";
};
class GPService : public QObject class GPService : public QObject
{ {