Skip to content

Commit 81e20af

Browse files
committed
Do not close GitTfsDialog if Cancel button was hit in ShelveDialog.
1 parent 350414d commit 81e20af

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

GitTfsDialog.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,11 @@ private void PushButtonClick(object sender, EventArgs e)
122122
else if (ShelveRadioButton.Checked)
123123
{
124124
_settings.PushSetting = PushSetting.Shelve;
125-
new ShelveDialog(_commands, _settings.ShelveSettings).ShowDialog();
125+
var dialogResult = new ShelveDialog(_commands, _settings.ShelveSettings).ShowDialog();
126+
if (dialogResult == DialogResult.Cancel)
127+
{
128+
return;
129+
}
126130
}
127131
else if (RCheckinRadioButton.Checked)
128132
{

ShelveDialog.Designer.cs

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)