From b98fce7980d89f14e044f2affa8a125bf43ebd76 Mon Sep 17 00:00:00 2001 From: Alessio Morale Date: Sun, 9 Mar 2014 15:07:11 +0100 Subject: [PATCH] OP-1230 fix paths for Windows as suggested by Filnet --- .../src/plugins/uploader/devicewidget.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp b/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp index b0f6a4994..1566ceb1f 100644 --- a/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp +++ b/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp @@ -524,25 +524,19 @@ QString DeviceWidget::getDevFirmwarePath() { QDir fwDirectory; QString fwDirectoryStr; + fwDirectoryStr = QCoreApplication::applicationDirPath(); + fwDirectory = QDir(fwDirectoryStr); #ifdef Q_OS_WIN - fwDirectoryStr = QCoreApplication::applicationDirPath(); - fwDirectory = QDir(fwDirectoryStr); - fwDirectory.cdUp(); - fwDirectory.cd("firmware"); - fwDirectoryStr = fwDirectory.absolutePath(); -#elif defined Q_OS_LINUX - fwDirectoryStr = QCoreApplication::applicationDirPath(); - fwDirectory = QDir(fwDirectoryStr); fwDirectory.cd("../.."); fwDirectoryStr = fwDirectory.absolutePath(); - fwDirectoryStr = fwDirectoryStr + "/fw_" + myDevice->lblBrdName->text().toLower() + "/fw_" + myDevice->lblBrdName->text().toLower() + ".opfw"; +#elif defined Q_OS_LINUX + fwDirectory.cd("../.."); + fwDirectoryStr = fwDirectory.absolutePath(); #elif defined Q_OS_MAC - fwDirectoryStr = QCoreApplication::applicationDirPath(); - fwDirectory = QDir(fwDirectoryStr); fwDirectory.cd("../../../../../.."); fwDirectoryStr = fwDirectory.absolutePath(); - fwDirectoryStr = fwDirectoryStr + "/fw_" + myDevice->lblBrdName->text().toLower() + "/fw_" + myDevice->lblBrdName->text().toLower() + ".opfw"; #endif + fwDirectoryStr = fwDirectoryStr + "/fw_" + myDevice->lblBrdName->text().toLower() + "/fw_" + myDevice->lblBrdName->text().toLower() + ".opfw"; return fwDirectoryStr; }