Changeset b8854f2 in tol

Timestamp:

May 9, 2011, 4:59:19 PM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

10adcbf

Parents:

b732e6d

Message:

Fixes #1199

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3527 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/OIS/oisloader.cpp (modified) (1 diff)

tol/OIS/oisloader.cpp

@@ -1419 +1419 @@
                      name+"' description='"+description+"')")); 
             }
-            bool oldEnabled = BOut::Disable();
+            BText expr = Compact(BParser::Unparse(tree,"  ","\n"));
+          //bool oldEnabled = BOut::Disable();
+            BDat numErr0 = TOLErrorNumber();
             x = (BUserTimeSet*)GraTimeSet()->EvaluateTree(tree); 
-            if(oldEnabled) { BOut::Enable(); }
+            BDat numErr1 = TOLErrorNumber();
+            if(numErr0<numErr1) { DESTROY(x); }
+          //if(oldEnabled) { BOut::Enable(); }
             if(x) 
             { 
               assert(s || (tree!=NULL));
-              if(s && (control_.oisEngine_.oisVersion_>="02.03"))
+              if(!x->System())
               {
-                x->PutCache(h, beginCache, endCache);
+                if(s && (control_.oisEngine_.oisVersion_>="02.03"))
+                {
+                  x->PutCache(h, beginCache, endCache);
+                }
               }
               x->PutOisTree(tree);