1 files changed, 31 insertions, 13 deletions
diff --git a/src/filedialogmemory.cpp b/src/filedialogmemory.cpp
index 6b440d0f..0e3e9793 100644
--- a/src/filedialogmemory.cpp
+++ b/src/filedialogmemory.cpp
@@ -56,33 +56,51 @@ void FileDialogMemory::restore(QSettings &settings)
 }
 
 
-QString FileDialogMemory::getOpenFileName(const QString &dirID, QWidget *parent,
-                 const QString &caption, const QString &dir,
-                 const QString &filter, QString *selectedFilter,
-                 QFileDialog::Options options)
+QString FileDialogMemory::getOpenFileName(
+  const QString &dirID, QWidget *parent, const QString &caption,
+  const QString &dir, const QString &filter, QString *selectedFilter,
+  QFileDialog::Options options)
 {
-  std::pair<std::map<QString, QString>::iterator, bool> currentDir =
-      instance().m_Cache.insert(std::make_pair(dirID, dir));
+  QString currentDir = dir;
+
+  if (currentDir.isEmpty()) {
+    auto itor = instance().m_Cache.find(dirID);
+    if (itor != instance().m_Cache.end()) {
+      currentDir = itor->second;
+    }
+  }
+
+  QString result = QFileDialog::getOpenFileName(
+    parent, caption, currentDir, filter, selectedFilter, options);
 
-  QString result = QFileDialog::getOpenFileName(parent, caption, currentDir.first->second,
-                                                filter, selectedFilter, options);
   if (!result.isNull()) {
     instance().m_Cache[dirID] = QFileInfo(result).path();
   }
+
   return result;
 }
 
 
-QString FileDialogMemory::getExistingDirectory(const QString &dirID, QWidget *parent,
-                 const QString &caption, const QString &dir, QFileDialog::Options options)
+QString FileDialogMemory::getExistingDirectory(
+  const QString &dirID, QWidget *parent, const QString &caption,
+  const QString &dir, QFileDialog::Options options)
 {
-  std::pair<std::map<QString, QString>::iterator, bool> currentDir =
-      instance().m_Cache.insert(std::make_pair(dirID, dir));
+  QString currentDir = dir;
+
+  if (currentDir.isEmpty()) {
+    auto itor = instance().m_Cache.find(dirID);
+    if (itor != instance().m_Cache.end()) {
+      currentDir = itor->second;
+    }
+  }
+
+  QString result = QFileDialog::getExistingDirectory(
+    parent, caption, currentDir, options);
 
-  QString result = QFileDialog::getExistingDirectory(parent, caption, currentDir.first->second, options);
   if (!result.isNull()) {
     instance().m_Cache[dirID] = QFileInfo(result).path();
   }
+
   return result;
 }