more bug fixes

diff --git a/actionlist.cc b/actionlist.cc
index 3ffaa38355c6f66c07730f6004b19bdc19e9617f..e76f5aedf8b899e9124d6c6ceeca798196ac726a 100644 (file)
--- a/actionlist.cc
+++ b/actionlist.cc
@@ -168,8 +168,8 @@ void decrementCount(allnode * ptr) {
                                        decrementCount(ptr->parent);
                                }
                        }
+                       delete ptr;
                }
-               delete ptr;
        }
 }
 
@@ -204,7 +204,7 @@ void actionlist::removeAction(ModelAction * act) {
                                                }
                                                if (first) {
                                                        //see if previous node has same clock as us...
-                                                       if (llnodeprev->val->get_seq_number() == clock) {
+                                                       if (llnodeprev != NULL && llnodeprev->val->get_seq_number() == clock) {
                                                                ptr->children[index] = reinterpret_cast<allnode *>(((uintptr_t)llnodeprev) | ISACT);
                                                        } else {
                                                                //remove ourselves and go up tree