Changeset 356180

Timestamp:

May 29, 2010, 2:15:27 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

5cf5a4

Parents:

2e06c4

git-author:

Frederik Heber <heber@…> (05/29/10 14:10:24)

git-committer:

Frederik Heber <heber@…> (05/29/10 14:15:27)

Message:

FIX: Flag returned by ParseCommandLineOptions() needs to be heeded, e.g. for FragmentMolecule().

• now, there is again an ExitFlag and if {0,1} we return 0 and else the ExitFlag on exit.

Signed-off-by: Frederik Heber <heber@…>

File:

• molecuilder/src/builder.cpp (modified) (3 diffs)

molecuilder/src/builder.cpp

@@ -2499 +2499 @@
     char **Arguments = NULL;
     int ArgcSize = 0;
+    int ExitFlag = 0;
     bool ArgumentsCopied = false;
 
@@ -2514 +2515 @@
       char ConfigFileName[MAXSTRINGSIZE];
       // handle arguments by ParseCommandLineOptions()
-      ParseCommandLineOptions(argc,argv,World::getInstance().getMolecules(),World::getInstance().getPeriode(),*World::getInstance().getConfig(), (char *&)ConfigFileName, ArgcList);
+      ExitFlag = ParseCommandLineOptions(argc,argv,World::getInstance().getMolecules(),World::getInstance().getPeriode(),*World::getInstance().getConfig(), (char *&)ConfigFileName, ArgcList);
       // copy all remaining arguments to a new argv
       Arguments = Malloc<char *>(ArgcList.size(), "main - **Arguments");
@@ -2559 +2560 @@
   cleanUp();
   Memory::getState();
-  return (0);
+  return (ExitFlag == 1 ? 0 : ExitFlag);
 }