Normalize path (slashes to be precise) when opening a database or sav…

…ing the last used database paths (keepassxreboot#7864) Fixes keepassxreboot#7821
Wriver · Apr 12, 2022 · 692c95b · 692c95b
1 parent 5916a8f
commit 692c95b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
@@ -21,6 +21,7 @@
 
 #include <QCloseEvent>
 #include <QDesktopServices>
+#include <QDir>
 #include <QFileInfo>
 #include <QList>
 #include <QMimeData>
@@ -1388,7 +1389,7 @@ bool MainWindow::saveLastDatabases()
         QStringList openDatabases;
         for (int i = 0; i < m_ui->tabWidget->count(); ++i) {
             auto dbWidget = m_ui->tabWidget->databaseWidgetFromIndex(i);
-            openDatabases.append(dbWidget->database()->filePath());
+            openDatabases.append(QDir::toNativeSeparators(dbWidget->database()->filePath()));
         }
 
         config()->set(Config::LastOpenedDatabases, openDatabases);

diff --git a/src/main.cpp b/src/main.cpp
@@ -17,6 +17,7 @@
  */
 
 #include <QCommandLineParser>
+#include <QDir>
 #include <QFile>
 #include <QWindow>
 
@@ -180,7 +181,7 @@ int main(int argc, char** argv)
         }
 
         if (!filename.isEmpty() && QFile::exists(filename) && !filename.endsWith(".json", Qt::CaseInsensitive)) {
-            mainWindow.openDatabase(filename, password, parser.value(keyfileOption));
+            mainWindow.openDatabase(QDir::toNativeSeparators(filename), password, parser.value(keyfileOption));
         }
     }