From f3d3b7227de162f824b8be6be4028a8848f11f2f Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Thu, 16 Aug 2018 10:51:40 +0300
Subject: [PATCH] Fix a bug in merging ChoiceConditions

---
 source/choicecondition.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/choicecondition.h b/source/choicecondition.h
index 424dca6..91b5e71 100644
--- 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)
-- 
2.45.2