From 81fea7cb9aea5797bfab93ab3d2f4f7090b2a12d Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 2 Nov 2012 07:15:11 +0000
Subject: [PATCH] autoSaveDatabase also governs auto load
---
Fltk/onelabWindow.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp
index 93f33ce908..af83909db0 100644
--- a/Fltk/onelabWindow.cpp
+++ b/Fltk/onelabWindow.cpp
@@ -745,7 +745,7 @@ onelabWindow::onelabWindow(int deltaFontSize)
_gearOptionsStart = _gear->menu()->size();
- _gear->add("Save database automatically", 0, onelab_option_cb, (void*)"save",
+ _gear->add("Save && load database automatically", 0, onelab_option_cb, (void*)"save",
FL_MENU_TOGGLE);
_gear->add("Archive output files automatically", 0, onelab_option_cb, (void*)"archive",
FL_MENU_TOGGLE);
@@ -1388,8 +1388,10 @@ void solver_cb(Fl_Widget *w, void *data)
else
FlGui::instance()->onelab->rebuildSolverList();
- std::string db = SplitFileName(GModel::current()->getFileName())[0] + "onelab.db";
- if(!StatFile(db)) loadDb(db);
+ if(CTX::instance()->solver.autoSaveDatabase){
+ std::string db = SplitFileName(GModel::current()->getFileName())[0] + "onelab.db";
+ if(!StatFile(db)) loadDb(db);
+ }
if(FlGui::instance()->onelab->isBusy())
FlGui::instance()->onelab->show();
@@ -1416,7 +1418,7 @@ int metamodel_cb(const std::string &name, const std::string &action)
onelab::number n("IsMetamodel", 1.);
n.setVisible(false);
onelab::server::instance()->set(n);
- std::vector<std::string> split = SplitFileName(name);
+ std::vector<std::string> split = SplitFileName(name);
onelab::string s1("Arguments/WorkingDir",
split[0].size()?split[0]:getCurrentWorkdir());
s1.setVisible(false);
--
GitLab