Fix a bug in merging ChoiceConditions

diff --git a/source/choicecondition.h b/source/choicecondition.h
index 424dca6a8fce12be193e6a9fb02f8048db309a7a..91b5e71aa5e58bbc22ead2df8cf8a54bbc7ca7b8 100644 (file)
--- a/source/choicecondition.h
+++ b/source/choicecondition.h
@@ -72,7 +72,7 @@ ChoiceCondition<T> *ChoiceCondition<T>::merge(const std::vector<Condition *> &co
        if(dynamic_cast<const OrCondition *>(&parent) && !conditions.empty())
        {
                ChoiceCondition<T> *result = 0;
-               for(std::vector<Condition *>::const_iterator i=conditions.begin(); ++i!=conditions.end(); )
+               for(std::vector<Condition *>::const_iterator i=conditions.begin(); i!=conditions.end(); ++i)
                {
                        const std::vector<Type> &v = static_cast<ChoiceCondition<T> *>(*i)->values;
                        if(!result)