From b325bc732f7cd12994f661d1af693bd02175aee4 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 20 Oct 2011 05:01:38 +0000
Subject: [PATCH] cleanup
---
Common/Gmsh.cpp | 1 -
Fltk/menuWindow.cpp | 1 -
Fltk/onelabWindow.cpp | 6 ++----
Fltk/optionWindow.cpp | 10 +++++++---
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Common/Gmsh.cpp b/Common/Gmsh.cpp
index 5890ce3c52..71e2e678d5 100644
--- a/Common/Gmsh.cpp
+++ b/Common/Gmsh.cpp
@@ -251,7 +251,6 @@ int GmshFLTK(int argc, char **argv)
// listen to external solvers
if(CTX::instance()->solver.listen){
onelab::localNetworkClient *c = new onelab::localNetworkClient("Listen", "");
- onelab::server::instance()->registerClient(c);
c->run("");
}
diff --git a/Fltk/menuWindow.cpp b/Fltk/menuWindow.cpp
index 39cc74c319..abb8b7feb0 100644
--- a/Fltk/menuWindow.cpp
+++ b/Fltk/menuWindow.cpp
@@ -170,7 +170,6 @@ static void file_remote_cb(Fl_Widget *w, void *data)
if(it == onelab::server::instance()->lastClient()){
c = new onelab::localNetworkClient("GmshRemote", "");
c->setSocketSwitch("-socket");
- onelab::server::instance()->registerClient(c);
}
else
c = (onelab::localNetworkClient*)it->second;
diff --git a/Fltk/onelabWindow.cpp b/Fltk/onelabWindow.cpp
index 5c20460fab..88de82c7c8 100644
--- a/Fltk/onelabWindow.cpp
+++ b/Fltk/onelabWindow.cpp
@@ -607,10 +607,8 @@ void onelabWindow::rebuildSolverList()
void onelabWindow::addSolver(const std::string &name, const std::string &commandLine)
{
onelab::server::citer it = onelab::server::instance()->findClient(name);
- if(it == onelab::server::instance()->lastClient()){
- onelab::client *c = new onelab::localNetworkClient(name, commandLine);
- onelab::server::instance()->registerClient(c);
- }
+ if(it == onelab::server::instance()->lastClient())
+ new onelab::localNetworkClient(name, commandLine);
FlGui::instance()->onelab->rebuildSolverList();
}
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index 7958390b91..bad3d05418 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -514,9 +514,13 @@ static void solver_options_ok_cb(Fl_Widget *w, void *data)
int old_listen = (int)opt_solver_listen(0, GMSH_GET, o->solver.butt[0]->value());
opt_solver_listen(0, GMSH_SET, o->solver.butt[0]->value());
if(!old_listen && o->solver.butt[0]->value()){
- onelab::localNetworkClient *c = new onelab::localNetworkClient("Listen", "");
- onelab::server::instance()->registerClient(c);
- c->run("");
+ onelab::server::citer it = onelab::server::instance()->findClient("Listen");
+ if(it == onelab::server::instance()->lastClient()){
+ onelab::localNetworkClient *c = new onelab::localNetworkClient("Listen", "");
+ c->run("");
+ }
+ else
+ it->second->run("");
}
opt_solver_socket_name(0, GMSH_SET, o->solver.input[0]->value());
--
GitLab