Improve conflict detector

SS111 · Aug 11, 2013 · 88444e0 · 88444e0
1 parent 9e2b813
commit 88444e0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/com/github/ss111/ConflictHelper.java b/src/com/github/ss111/ConflictHelper.java
@@ -40,13 +40,15 @@ public static Boolean isConflicting(MultiValueMap map, Integer key, String type)
 		} else {
 
 			ArrayList<String> namesArray = new ArrayList<String>();
+			ArrayList<String> configArray = new ArrayList<String>();
 
 			for (ArrayList<String> combo : names) {
 
 				namesArray.add(combo.toArray()[0].toString());
+				configArray.add(combo.toArray()[1].toString());
 			}
 
-			if (namesArray.toArray()[0].toString().equals(namesArray.toArray()[1].toString())) {
+			if (namesArray.toArray()[0].toString().equals(namesArray.toArray()[1].toString()) || configArray.toArray()[0].toString().equals(configArray.toArray()[1].toString())) {
 
 				return false;