From 24e9858fe411e23a9edfce118c4513465457618f Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Mon, 14 Jan 2019 17:08:29 +0200
Subject: Fixed some issue with creating new machine.

---
 .../Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs')

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;
-- 
cgit v1.3.1