fix(cpn): update last used directory on save (#5629)

EdgeTX · Oct 21, 2024 · 60fe06a · 60fe06a
1 parent df1687a
commit 60fe06a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp
@@ -350,13 +350,9 @@ void MainWindow::openDocURL()
   QDesktopServices::openUrl(QUrl(link));
 }
 
-void MainWindow::openFile(const QString & fileName, bool updateLastUsedDir)
+void MainWindow::openFile(const QString & fileName)
 {
   if (!fileName.isEmpty()) {
-    if (updateLastUsedDir) {
-      g.eepromDir(QFileInfo(fileName).dir().absolutePath());
-    }
-
     QMdiSubWindow *existing = findMdiChild(fileName);
     if (existing) {
       mdiArea->setActiveSubWindow(existing);
@@ -414,7 +410,7 @@ void MainWindow::openRecentFile()
   QAction *action = qobject_cast<QAction *>(sender());
   if (action) {
     QString fileName = action->data().toString();
-    openFile(fileName, false);
+    openFile(fileName);
   }
 }
 

diff --git a/companion/src/mainwindow.h b/companion/src/mainwindow.h
@@ -116,7 +116,7 @@ class MainWindow : public QMainWindow
     void downloads();
     void doUpdates(bool check, bool interactive = true);
 
-    void openFile(const QString & fileName, bool updateLastUsedDir = false);
+    void openFile(const QString & fileName);
 
   private:
     QAction * addAct(const QString & icon, const char * slot = NULL, const QKeySequence & shortcut = 0, QObject * slotObj = NULL, const char * signal = NULL);

diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp
@@ -1327,8 +1327,6 @@ bool MdiChild::saveAs(bool isNew)
   }
   while (QFileInfo(fileName).suffix().toLower() != "etx");
 
-  g.eepromDir(QFileInfo(fileName).dir().absolutePath());
-
   return saveFile(fileName, true);
 }
 
@@ -1341,6 +1339,8 @@ bool MdiChild::saveFile(const QString & filename, bool setCurrent)
     return false;
   }
 
+  g.eepromDir(QFileInfo(filename).dir().absolutePath());
+
   for (int i = 0; i < (int)radioData.models.size(); i++) {
     if (!radioData.models[i].isEmpty())
       radioData.models[i].modelUpdated = false;