From: Morgan Deters <mdeters@cs.nyu.edu>
Date: Tue, 5 Mar 2013 22:49:25 +0000 (-0500)
Subject: Merge branch '1.0.x'
X-Git-Tag: cvc5-1.0.0~7399
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=66b99ac64a6920787905948315e74ca1c5b3e90b;p=cvc5.git

Merge branch '1.0.x'

Conflicts:
	src/smt/smt_engine.cpp
---

66b99ac64a6920787905948315e74ca1c5b3e90b
diff --cc src/smt/smt_engine.cpp
index e7c0999da,af02c5186..8eb6664ca
--- a/src/smt/smt_engine.cpp
+++ b/src/smt/smt_engine.cpp
@@@ -388,10 -366,7 +388,11 @@@ public
    }
  
    ~SmtEnginePrivate() {
 +    if(d_propagatorNeedsFinish) {
 +      d_propagator.finish();
 +      d_propagatorNeedsFinish = false;
 +    }
+     d_smt.d_nodeManager->unsubscribeEvents(this);
    }
  
    void nmNotifyNewSort(TypeNode tn) {