From ad50c032fd1959d393a7532ee2f6e1a737225bc7 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Thu, 15 Nov 2012 10:46:20 +0100
Subject: [PATCH] Set working directory for Merge projects command

---
 src/Gui/CommandDoc.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Gui/CommandDoc.cpp b/src/Gui/CommandDoc.cpp
index 698da1a91..030a283dc 100644
--- a/src/Gui/CommandDoc.cpp
+++ b/src/Gui/CommandDoc.cpp
@@ -295,9 +295,10 @@ void StdCmdMergeProjects::activated(int iMsg)
 {
     QString exe = qApp->applicationName();
     QString project = QFileDialog::getOpenFileName(Gui::getMainWindow(),
-        QString::fromUtf8(QT_TR_NOOP("Merge project")), QDir::homePath(),
+        QString::fromUtf8(QT_TR_NOOP("Merge project")), FileDialog::getWorkingDirectory(),
         QString::fromUtf8(QT_TR_NOOP("%1 document (*.fcstd)")).arg(exe));
     if (!project.isEmpty()) {
+        FileDialog::setWorkingDirectory(project);
         App::Document* doc = App::GetApplication().getActiveDocument();
         QFileInfo info(QString::fromUtf8(doc->FileName.getValue()));
         QFileInfo proj(project);