When adding a new entry to the vote collection, make sure it doesn't …

…already exist (in the case of condensed rank votes), and that rank votes are in condensed form when being added.
Kinematics · Oct 26, 2015 · 0fa541f · 0fa541f
1 parent c7bbdac
commit 0fa541f
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/NetTally/MergeVotesWindow.xaml.cs b/NetTally/MergeVotesWindow.xaml.cs
@@ -289,7 +289,12 @@ private void merge_Click(object sender, RoutedEventArgs e)
                     VoteCollection.Remove(fromVote);
                     if (votesDiff.Count() == 1)
                     {
-                        VoteCollection.Add(votesDiff.First());
+                        string addVote = votesDiff.First();
+                        if (CurrentVoteType == VoteType.Rank)
+                            addVote = VoteString.CondenseRankVote(addVote);
+
+                        if (!VoteCollection.Contains(addVote))
+                            VoteCollection.Add(addVote);
                     }