From ff65e90b68df436f54e2c324af242b53301b61cf Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Tue, 6 Jan 2009 22:08:29 +0000
Subject: [PATCH] *** empty log message ***
---
Common/Main.cpp | 4 +---
Fltk/Main.cpp | 6 ++----
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/Common/Main.cpp b/Common/Main.cpp
index 8e87ff7eb3..f0eda40898 100644
--- a/Common/Main.cpp
+++ b/Common/Main.cpp
@@ -22,9 +22,7 @@ int main(int argc, char *argv[])
new GModel();
GmshInitialize(argc, argv);
- // force these even if the options say it ain't so
- CTX.nopopup = 1;
- CTX.terminal = 1;
+ CTX.terminal = CTX.nopopup = 1;
GmshBatch();
GmshFinalize();
diff --git a/Fltk/Main.cpp b/Fltk/Main.cpp
index d13ac2c393..2059fa056a 100644
--- a/Fltk/Main.cpp
+++ b/Fltk/Main.cpp
@@ -40,11 +40,9 @@ int main(int argc, char *argv[])
// Initialize static stuff (parser symbols, options)
GmshInitialize(argc, argv);
- // Always print info on terminal for non-interactive execution
- if(CTX.batch) CTX.terminal = 1;
-
// Non-interactive Gmsh
if(CTX.batch) {
+ CTX.terminal = 1;
GmshBatch();
GmshFinalize();
Msg::Exit(0);
@@ -106,7 +104,7 @@ int main(int argc, char *argv[])
break;
}
- // Read background mesh on disk
+ // Read background mesh if any
if(!CTX.bgm_filename.empty()) {
MergeFile(CTX.bgm_filename);
if(PView::list.size())
--
GitLab