Correctly search for Minetestmapper

master
Unknown 2019-03-30 13:23:37 +01:00
parent 8dfc9d8a6a
commit b58a3a0851
1 changed files with 3 additions and 7 deletions

View File

@ -9,7 +9,7 @@
#include "mainwindow.h"
#include "ui_configdialog.h"
const QString ConfigSettings::defaultMapperExecutableName("minetestmapper");
const QString ConfigSettings::defaultMapperExecutableName("Minetestmapper");
QStringList ConfigSettings::predefinedMapperLocations;
ConfigSettings::InitStatics::InitStatics()
@ -154,15 +154,11 @@ QStringList ConfigSettings::getMapperExecutables()
QString mapperFileName;
mapperFileName = QStandardPaths::findExecutable(ConfigSettings::defaultMapperExecutableName, QStringList(appDir));
if (mapperFileName != "")
if (!mapperFileName.isEmpty())
mapperLocations << mapperFileName;
mapperFileName = QStandardPaths::findExecutable(ConfigSettings::defaultMapperExecutableName, QStringList(appDir + '/' + ConfigSettings::defaultMapperExecutableName));
if (mapperFileName != "")
mapperLocations << mapperFileName;
mapperFileName = QStandardPaths::findExecutable(ConfigSettings::defaultMapperExecutableName, QStringList(appDir + "/mapper"));
if (mapperFileName != "")
if (!mapperFileName.isEmpty())
mapperLocations << mapperFileName;
#endif