From 907eb85b7cdd82f3ecc1d22282d263e2bf38be99 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 2 Oct 2009 06:09:57 +0000
Subject: [PATCH] don't force terminal output if running as client
---
Common/Main.cpp | 5 ++++-
Fltk/Main.cpp | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Common/Main.cpp b/Common/Main.cpp
index 56fd743130..53906bddc2 100644
--- a/Common/Main.cpp
+++ b/Common/Main.cpp
@@ -20,7 +20,10 @@ int main(int argc, char *argv[])
new GModel();
GmshInitialize(argc, argv);
- CTX::instance()->terminal = CTX::instance()->noPopup = 1;
+
+ if(!Msg::GetClient())
+ CTX::instance()->terminal = CTX::instance()->noPopup = 1;
+
GmshBatch();
GmshFinalize();
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index f8fee40057..da0cab3f91 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
// Non-interactive Gmsh
if(CTX::instance()->batch) {
- CTX::instance()->terminal = 1;
+ if(!Msg::GetClient()) CTX::instance()->terminal = 1;
GmshBatch();
GmshFinalize();
Msg::Exit(0);
--
GitLab