rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/hayvosh/OP-1634_CloudConfig_uses_wrong_path' into rel-14.10

Browse Source
This commit is contained in:
Fredrik Larsson 2014-11-23 09:10:43 +11:00
commit edbf1a0850
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp
View File

@ -31,6 +31,7 @@
#include <QJsonArray> #include <QJsonArray>
#include <QDir> #include <QDir>
#include "vehicletemplateexportdialog.h" #include "vehicletemplateexportdialog.h"
#include "utils/pathutils.h"
AirframeInitialTuningPage::AirframeInitialTuningPage(SetupWizard *wizard, QWidget *parent) : AirframeInitialTuningPage::AirframeInitialTuningPage(SetupWizard *wizard, QWidget *parent) :
AbstractWizardPage(wizard, parent), AbstractWizardPage(wizard, parent),
@ -178,7 +179,7 @@ void AirframeInitialTuningPage::loadValidFiles()
} }
m_templates.clear(); 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; QStringList names;
names << "*.optmpl"; names << "*.optmpl";
templateDir.setNameFilters(names); templateDir.setNameFilters(names);