diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-01-16 13:45:38 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-01-16 13:45:38 +0200 |
| commit | 994456523c7adf2f77dd7f74c639262b59d56ec4 (patch) | |
| tree | e238062693ee5e877a86a777cc279498cb31ab0b /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs | |
| parent | 09e4d329538f348c759534f282f2a6ed3bb42420 (diff) | |
| parent | 1ee11bc9771c807c4d0ecb4d73e4bc33b307ae1e (diff) | |
| download | Tango-994456523c7adf2f77dd7f74c639262b59d56ec4.tar.gz Tango-994456523c7adf2f77dd7f74c639262b59d56ec4.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs index 71b2e0bd5..22bf03148 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs @@ -585,7 +585,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels vm.MachineVersions = MachinesAdapter.MachineVersions.ToList(); _notification.ShowModalDialog<MachineCreationDialogVM, Views.MachineCreationDialog>(vm, (x) => { - if (String.IsNullOrWhiteSpace(vm.SelectedMachineVersion.PrototypeMachineData)) + if (vm.SelectedMachineVersion != null && String.IsNullOrWhiteSpace(vm.SelectedMachineVersion.PrototypeMachineData)) { _notification.ShowError("The selected version does not contain any prototype machine data."); return; |