Changeset 7347df in git

Timestamp:

Feb 24, 2012, 6:37:31 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e8086733d77deaf0656dc33bc685bcc08f6a96ab

Parents:

6fcb1b3c2393904d51eeb611bdae4812282eddfc

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-02-24 18:37:31+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2012-02-24 18:38:14+01:00

Message:

fix: better check for adding package to Top (enterid)

File:

• Singular/ipid.cc (modified) (3 diffs)

Singular/ipid.cc

@@ -238 +238 @@
   s=omStrDup(s);
   idhdl *save_root=root;
-  if (t==PACKAGE_CMD) root=&(basePack->idroot);
+  BOOLEAN to_reset=FALSE;
+  if (t==PACKAGE_CMD)
+  {
+    if (root!=&(basePack->idroot))
+    {
+      root=&(basePack->idroot);
+      to_reset=TRUE;
+    }
+  }
   // is it already defined in root ?
   if ((h=(*root)->get(s,lev))!=NULL)
@@ -302 +310 @@
   checkall();
 #endif
-  if (t==PACKAGE_CMD) root=save_root;
+  if (to_reset) root=save_root;
   return *root;
 
@@ -310 +318 @@
     //listall();
     omFree((ADDRESS)s);
-    if (t==PACKAGE_CMD) root=save_root;
+    if (to_reset) root=save_root;
     return NULL;
 }