yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2832
committer: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2011-04-22 11:12:53 +0200
message:
  - fix the action condition (was it never tested?)
modified:
  pkg/common/ParallelEngine.cpp


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription

=== modified file 'pkg/common/ParallelEngine.cpp'
--- pkg/common/ParallelEngine.cpp	2010-10-13 16:23:08 +0000
+++ pkg/common/ParallelEngine.cpp	2011-04-22 09:12:53 +0000
@@ -18,7 +18,7 @@
 		FOREACH(const shared_ptr<Engine>& e, slaves[i]) {
 			//cerr<<"["<<omp_get_thread_num()<<":"<<e->getClassName()<<"]";
 			e->scene=scene;
-			if(e->dead || !e->isActivated()) e->action();
+			if(!e->dead && e->isActivated()) e->action();
 		}
 	}
 }