From 19dffc5b88d2eeee833b7e469297a6ce535c7183 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Wed, 27 Mar 2013 11:45:11 +0100 Subject: Olivier's fix for advancement! --- .../java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/com/c2kernel/lifecycle') diff --git a/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java b/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java index 6a3abe7..982d951 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java @@ -80,7 +80,7 @@ public class AdvancementCalculator implements Serializable current.mIsbranchActive = current.mIsbranchActive || adv.mIsbranchActive||act.getActive(); current.mNbActLeftWithCurrent += adv.mNbActLeftWithCurrent; current.mNbActLeftWithoutCurrent += adv.mNbActLeftWithoutCurrent; - current.mHasPrevActive = adv.mHasPrevActive||act.getActive(); + current.mHasPrevActive |= adv.mHasPrevActive||act.getActive(); if (adv.hasprevActive.size()!=0) current.mHasPrevActive=true; } else -- cgit v1.2.3