From 124e3825c4e18e275c41d70a20ff21f446cc03a3 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 26 Nov 2013 18:38:06 +0000
Subject: [PATCH] oops
---
Common/OpenFile.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index e9baf92526..1ae820e65e 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -303,7 +303,7 @@ int MergeFile(const std::string &fileName, bool warnIfMissing, bool setWindowTit
Msg::Error("Failed to uncompress `%s': check directory permissions",
fileName.c_str());
GModel::current()->setFileName(noExt);
- return MergeFile(noExt, true, setWindowTitle);
+ return MergeFile(noExt, false, setWindowTitle);
}
}
@@ -659,7 +659,7 @@ void OpenProject(const std::string &fileName, bool setWindowTitle)
ResetTemporaryBoundingBox();
// merge the file
- if(MergeFile(fileName, true, setWindowTitle)) {
+ if(MergeFile(fileName, false, setWindowTitle)) {
if(fileName != CTX::instance()->recentFiles.front())
CTX::instance()->recentFiles.insert
(CTX::instance()->recentFiles.begin(), fileName);
--
GitLab