Changeset 13938 for trunk/FACT++

Timestamp:

05/27/12 12:02:54 (12 years ago)

Author:

tbretz

Message:

Make sure that the section outside of an Execute is properly set to -3 and not overwritten by a saved state.

File:

• trunk/FACT++/src/Readline.cc (modified) (3 diffs)

trunk/FACT++/src/Readline.cc

@@ -99 +99 @@
 //
 Readline::Readline(const char *prgname) :
-    fMaxLines(500), fLine(0), fLabel(-1), fCompletion(0)
+    fMaxLines(500), fLine(0), fSection(-3), fLabel(-1), fCompletion(0)
 {
     if (This)
@@ -1076 +1076 @@
         const int save = fSection;
         Execute(opt, data);
-        fSection = save;
-        SetSection(save);
+        if (save!=-3)
+        {
+            fSection = save;
+            SetSection(save);
+        }
 
         return true;
@@ -1399 +1402 @@
     }
 
+    fCommandLog << "# " << Time() << " - " << name << " (FINISHED[" << fScriptDepth<< "])" << endl;
+
+    if (--fScriptDepth==0)
+        fStopScript = false;
+
     fLabel = -1;
     fSection = -3;
     SetSection(-3);
-
-    fCommandLog << "# " << Time() << " - " << name << " (FINISHED[" << fScriptDepth<< "])" << endl;
-
-    if (--fScriptDepth==0)
-        fStopScript = false;
 
     return rc;