From cfe28eaf0adcd54776c0a369210e6f7b4bca9558 Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Sun, 30 Dec 2018 19:25:18 +0200
Subject: Added machine clone in machine designer !

---
 .../Modules/MachineStudio.Dispensers/ViewModels/MainViewVM.cs        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels/MainViewVM.cs
index ca384f6bf..d92d86580 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/MachineStudio.Dispensers/ViewModels/MainViewVM.cs
@@ -170,7 +170,10 @@ namespace Tango.MachineStudio.Dispensers.ViewModels
                 {
                     IsFree = false;
                     await _activeContext.SaveChangesAsync();
-                    await SelectedDispenser.Reload(_dbContext);
+                    if (SelectedDispenser != null)
+                    {
+                        await SelectedDispenser.Reload(_dbContext);
+                    }
                 }
                 catch (Exception ex)
                 {
-- 
cgit v1.3.1