mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-12-01 09:24:10 +01:00
Merge remote-tracking branch 'origin/hayvosh/OP-1634_CloudConfig_uses_wrong_path' into rel-14.10
This commit is contained in:
commit
edbf1a0850
@ -31,6 +31,7 @@
|
||||
#include <QJsonArray>
|
||||
#include <QDir>
|
||||
#include "vehicletemplateexportdialog.h"
|
||||
#include "utils/pathutils.h"
|
||||
|
||||
AirframeInitialTuningPage::AirframeInitialTuningPage(SetupWizard *wizard, QWidget *parent) :
|
||||
AbstractWizardPage(wizard, parent),
|
||||
@ -178,7 +179,7 @@ void AirframeInitialTuningPage::loadValidFiles()
|
||||
}
|
||||
m_templates.clear();
|
||||
|
||||
QDir templateDir(QString("%1/%2/").arg(VehicleTemplateExportDialog::EXPORT_BASE_NAME).arg(m_dir));
|
||||
QDir templateDir(QString("%1/%2/").arg(Utils::PathUtils().InsertDataPath("%%DATAPATH%%cloudconfig")).arg(m_dir));
|
||||
QStringList names;
|
||||
names << "*.optmpl";
|
||||
templateDir.setNameFilters(names);
|
||||
|
Loading…
Reference in New Issue
Block a user