Don't call destroy() in destructor unless we're a body.

totalgee · Feb 28, 2014 · 2005f17 · 2005f17
1 parent a8fa92f
commit 2005f17
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/ofxBox2dBaseShape.cpp b/src/ofxBox2dBaseShape.cpp
@@ -24,8 +24,10 @@ ofxBox2dBaseShape::ofxBox2dBaseShape() {
 
 //----------------------------------------
 ofxBox2dBaseShape::~ofxBox2dBaseShape() {
-    ofLog(OF_LOG_VERBOSE, "~ofxBox2dBaseShape(%p)\n", body);
-    destroy();
+	ofLog(OF_LOG_VERBOSE, "~ofxBox2dBaseShape(%p)\n", body);
+	if (isBody()) {
+		destroy();
+	}
 }
 
 //------------------------------------------------
@@ -57,7 +59,8 @@ bool ofxBox2dBaseShape::shouldRemoveOffScreen(ofPtr<ofxBox2dBaseShape> shape) {
 bool ofxBox2dBaseShape::isBody() {
 	if (body == NULL) {
 		//cout << __FILE__ << __func__ << endl;
-		ofLog(OF_LOG_ERROR, "ofxBox2dBaseShape:: - body is not defined -");
+		// Why do we have to log something if we're not a body, when the
+		// whole point of this method is just to query whether we are...?
 		return false;
 	}
 	return true;