From dda70e1453a0ab4e00af312dfc8a68188e39f567 Mon Sep 17 00:00:00 2001
From: hka <hussein.kabbout@hotmail.com>
Date: Tue, 12 Apr 2022 21:05:06 +0200
Subject: [PATCH] Normalize path (slashes to be precise) when opening a
 database or saving the last used database paths (#7864)

Fixes #7821
---
 src/gui/MainWindow.cpp | 3 ++-
 src/main.cpp           | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index da3b5c721..558695dc2 100644
--- 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
index 24d891a06..9fabf89ed 100644
--- 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));
         }
     }