From 09d3e23a3ad21da2afbdd8a090f02b1e8ad197a6 Mon Sep 17 00:00:00 2001 From: Cyberboss Date: Fri, 10 Nov 2017 17:56:35 -0500 Subject: [PATCH] Fixes when test merge manager progress bar is shown --- TGControlPanel/TestMergeManager.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/TGControlPanel/TestMergeManager.cs b/TGControlPanel/TestMergeManager.cs index 437865bdd1..77addc793a 100644 --- a/TGControlPanel/TestMergeManager.cs +++ b/TGControlPanel/TestMergeManager.cs @@ -36,9 +36,6 @@ namespace TGControlPanel { Enabled = false; UseWaitCursor = true; - ApplyingPullRequestsLabel.Visible = true; - ApplyingPullRequestsProgressBar.Visible = true; - PullRequestListBox.Visible = false; try { PullRequestListBox.Items.Clear(); @@ -105,9 +102,6 @@ namespace TGControlPanel { Enabled = true; UseWaitCursor = false; - ApplyingPullRequestsLabel.Visible = false; - ApplyingPullRequestsProgressBar.Visible = false; - PullRequestListBox.Visible = true; } } @@ -130,6 +124,9 @@ namespace TGControlPanel { Enabled = false; UseWaitCursor = true; + ApplyingPullRequestsLabel.Visible = true; + ApplyingPullRequestsProgressBar.Visible = true; + PullRequestListBox.Visible = false; try { //so first collect a list of pulls that are checked @@ -192,6 +189,9 @@ namespace TGControlPanel { Enabled = true; UseWaitCursor = false; + ApplyingPullRequestsLabel.Visible = false; + ApplyingPullRequestsProgressBar.Visible = false; + PullRequestListBox.Visible = true; } }