X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fchoicecondition.h;h=c2f7f0e66875bf465721574ff4cf244af3605ca4;hb=3169efbcaa882c427d9cc1bbb6dbd187efe98f45;hp=424dca6a8fce12be193e6a9fb02f8048db309a7a;hpb=8b9d1f472e7bfbb1e097bb6d8bcad026e9636822;p=poefilter.git

diff --git a/source/choicecondition.h b/source/choicecondition.h
index 424dca6..c2f7f0e 100644
--- a/source/choicecondition.h
+++ b/source/choicecondition.h
@@ -1,6 +1,7 @@
 #ifndef CHOICECONDITION_H_
 #define CHOICECONDITION_H_
 
+#include <msp/core/algorithm.h>
 #include "condition.h"
 #include "filter.h"
 
@@ -71,14 +72,13 @@ 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(); )
+		ChoiceCondition<T> *result = new ChoiceCondition<T>(std::vector<Type>());
+		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)
-				result = new ChoiceCondition<T>(v);
-			else
-				result->values.insert(result->values.end(), v.begin(), v.end());
+			for(typename std::vector<Type>::const_iterator j=v.begin(); j!=v.end(); ++j)
+				if(Msp::find(result->values, *j)==result->values.end())
+					result->values.push_back(*j);
 		}
 		return result;
 	}