diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-01-15 18:32:46 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-01-15 18:32:46 +0200 |
| commit | fd181e6c3c9d0f67152243e4657b9e760d9f2c36 (patch) | |
| tree | 9c00e33d80fc556dd0fdbfff883608b73a2dc01c /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner | |
| parent | 6a313661146ecd208312504823b55610dadf0c88 (diff) | |
| parent | 24e9858fe411e23a9edfce118c4513465457618f (diff) | |
| download | Tango-fd181e6c3c9d0f67152243e4657b9e760d9f2c36.tar.gz Tango-fd181e6c3c9d0f67152243e4657b9e760d9f2c36.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner')
| -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; |