cleanup

Box/Box.cpp

-// $Id: Box.cpp,v 1.50 2008-03-23 21:42:56 geuzaine Exp $
+// $Id: Box.cpp,v 1.51 2008-04-13 18:52:51 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -80,9 +80,6 @@ int GMSHBOX(int argc, char *argv[])
   new GModel;
 
   OpenProject(CTX.filename);
-  if(gmsh_yyerrorstate)
-    ParUtil::Instance()->Abort();
-  else {
   for(unsigned int i = 1; i < CTX.files.size(); i++)
     MergeFile(CTX.files[i].c_str());
   if(CTX.bgm_filename) {
@@ -98,13 +95,10 @@ int GMSHBOX(int argc, char *argv[])
   }
   else if(CTX.batch == -1)
     CreateOutputFile(CTX.output_filename, FORMAT_GEO);
-    ParUtil::Instance()->Barrier(__LINE__, __FILE__);
-    return 1;
-  }
+
   ParUtil::Instance()->Barrier(__LINE__, __FILE__);
 
   GmshFinalize();
-  
   return 1;
 }
 

Fltk/Main.cpp

-// $Id: Main.cpp,v 1.126 2008-03-23 21:42:57 geuzaine Exp $
+// $Id: Main.cpp,v 1.127 2008-04-13 18:52:51 geuzaine Exp $
 //
 // Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
 //
@@ -78,9 +78,6 @@ int main(int argc, char *argv[])
   if(CTX.batch) {
     Msg(INFO, "'%s' started on %s", cmdline.c_str(), currtime.c_str());
     OpenProject(CTX.filename);
-    if(gmsh_yyerrorstate)
-      exit(1);
-    else {
     for(unsigned int i = 1; i < CTX.files.size(); i++)
       MergeFile(CTX.files[i].c_str());
     if(CTX.post.combine_time)
@@ -106,7 +103,6 @@ int main(int argc, char *argv[])
       GModel::current()->checkMeshCoherence();
     exit(0);
   }
-  }
 
   // Interactive Gmsh
   CTX.batch = -1; // The GUI is not ready yet for interactivity