From a46de7281d66f891e3f4731775c447bfc7659bef Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 28 Feb 2016 06:57:54 +0000
Subject: [PATCH] fix db name
---
Common/gmshLocalNetworkClient.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Common/gmshLocalNetworkClient.cpp b/Common/gmshLocalNetworkClient.cpp
index 87a5ac9229..2811106812 100644
--- a/Common/gmshLocalNetworkClient.cpp
+++ b/Common/gmshLocalNetworkClient.cpp
@@ -817,8 +817,9 @@ void solver_batch_cb(void *data)
}
// load db
- if(CTX::instance()->solver.autoSaveDatabase){
- std::string db = SplitFileName(GModel::current()->getFileName())[0] + "onelab.db";
+ if(CTX::instance()->solver.autoLoadDatabase){
+ std::vector<std::string> split = SplitFileName(GModel::current()->getFileName());
+ std::string db = split[0] + split[1] + ".db";
if(!StatFile(db)) loadDb(db);
}
@@ -846,7 +847,8 @@ void solver_batch_cb(void *data)
if(CTX::instance()->solver.autoSaveDatabase ||
CTX::instance()->solver.autoArchiveOutputFiles){
- std::string db = SplitFileName(GModel::current()->getFileName())[0] + "onelab.db";
+ std::vector<std::string> split = SplitFileName(GModel::current()->getFileName());
+ std::string db = split[0] + split[1] + ".db";
if(CTX::instance()->solver.autoArchiveOutputFiles) archiveOutputFiles(db);
if(CTX::instance()->solver.autoSaveDatabase) saveDb(db);
}
--
GitLab