cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-26 14:37:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #443 from tgstation/441-FixCrash

Browse Source 
Fixes Test Merge Manager crashing Control Panel
This commit is contained in:
Jordan Brown
2017-12-06 14:12:03 -05:00
committed by GitHub
parent 17020d3209 f6a3499532
commit d5ea6d65b8
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGS.ControlPanel/TestMergeManager.cs
+9 -8
View File
@@ -282,16 +282,17 @@ namespace TGS.ControlPanel
//Merge the PRs, collect errors
var errors = await Task.Run(() => repo.MergePullRequests(pulls, false));
//Show any errors
for (var I = 0; I < errors.Count(); ++I)
if (errors != null)
{
var err = errors.ElementAt(I);
if (err != null)
MessageBox.Show(err, String.Format("Error merging PR #{0}", pulls[I].Number));
}
if (errors.Count() != 0)
//Show any errors
for (var I = 0; I < errors.Count(); ++I)
{
var err = errors.ElementAt(I);
if (err != null)
MessageBox.Show(err, String.Format("Error merging PR #{0}", pulls[I].Number));
}
return;
}
if (pulls.Count > 0)
//regen the changelog