[Avida-SVN] r3435 - development/source/main

[dk at myxo.css.msu.edu]

Author: dk
Date: 2009-09-30 16:43:12 -0400 (Wed, 30 Sep 2009)
New Revision: 3435

Modified:
   development/source/main/cOrganism.cc
Log:
bugfix to message stat tracking when organisms are in the test CPU.

Modified: development/source/main/cOrganism.cc
===================================================================
--- development/source/main/cOrganism.cc	2009-09-30 20:15:51 UTC (rev 3434)
+++ development/source/main/cOrganism.cc	2009-09-30 20:43:12 UTC (rev 3435)
@@ -819,7 +819,11 @@
   assert(m_interface);
   InitMessaging();
 
-	m_interface->GetDeme()->IncMessageSent();
+	cDeme* deme = m_interface->GetDeme();
+	if(deme) {
+		deme->IncMessageSent();
+	}
+	
   // If we're able to succesfully send the message...
   if(m_interface->SendMessage(msg)) {
     // If we're remembering messages
@@ -836,9 +840,13 @@
     // check to see if we've performed any tasks...
     DoOutput(ctx);
     return true;
-  }
-	m_interface->GetDeme()->messageSendFailed();
-  return false;
+  } else {
+		// couldn't send the message
+		if(deme) {
+			deme->messageSendFailed();
+		}
+		return false;
+	}
 }