If the ranking algorithm returns an empty result instead of null, cat…

…ch that rather than letting it potentially break the output.
Kinematics · Jun 15, 2017 · 99f6149 · 99f6149
1 parent e0ea42c
commit 99f6149
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/NetTally.Core/Output/TallyOutput.cs b/NetTally.Core/Output/TallyOutput.cs
@@ -215,6 +215,9 @@ private void AddCompactTask(KeyValuePair<string, RankResults> task)
             int num = 1;
             foreach (var entry in task.Value)
             {
+                if (entry.Option == null)
+                    continue;
+
                 string debug = AdvancedOptions.Instance.DebugMode ? $" >>> {entry.Debug}" : string.Empty;
                 sb.AppendLine($"[{num++}] {entry.Option}{debug}");
             }
@@ -233,6 +236,9 @@ private void AddCompleteTask(KeyValuePair<string, RankResults> task)
             int index = 0;
             foreach (var winner in task.Value)
             {
+                if (winner.Option == null)
+                    continue;
+
                 sb.Append("[b]");
                 sb.Append(rankWinnerLabels[index++]);
                 sb.Append(":[/b] ");

diff --git a/NetTally.Core/Votes/Counting/RankVoteCounting/RIRVRankVoteCounter.cs b/NetTally.Core/Votes/Counting/RankVoteCounting/RIRVRankVoteCounter.cs
@@ -47,7 +47,7 @@ protected override RankResults RankTask(GroupedVotesByTask task)
             {
                 RankResult winner = GetWinningVote(voterRankings, rankedVotes);
 
-                if (winner == null)
+                if (winner == null || winner.Option == null)
                     break;
 
                 winningChoices.Add(winner);