diff options
| author | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-12-15 17:45:04 +0200 |
|---|---|---|
| committer | Shai Frieder <Shai.Frieder@twine-s.com> | 2019-12-15 17:45:04 +0200 |
| commit | 886a476b862f573be5b38036edfe9582946ebe1d (patch) | |
| tree | b6103fda927a5f8cfede9640fb51f1ce2abb3cb0 /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs | |
| parent | 65220384b09029ea1e672c119b6731a666261a21 (diff) | |
| parent | 24292197223caf2ffa1a771c38b2e2f7418ad03e (diff) | |
| download | Tango-886a476b862f573be5b38036edfe9582946ebe1d.tar.gz Tango-886a476b862f573be5b38036edfe9582946ebe1d.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs index e45c29f73..365c1db49 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs @@ -207,6 +207,11 @@ namespace Tango.MachineStudio.UI.ViewModels } } + protected override bool CanOK() + { + return base.CanOK() && CanClose; + } + private async void AbortUpgrade() { CanClose = true; |