Users & Roles !!

Fixed Shlomo PMR.

1 files changed, 10 insertions, 1 deletions

diff --git a/Software/Visual_Studio/Tango.Core/Commands/RelayCommand.cs b/Software/Visual_Studio/Tango.Core/Commands/RelayCommand.cs
index 359574a5c..427c83749 100644
--- a/Software/Visual_Studio/Tango.Core/Commands/RelayCommand.cs
+++ b/Software/Visual_Studio/Tango.Core/Commands/RelayCommand.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -47,7 +48,15 @@ namespace Tango.Core.Commands
 
         public virtual bool CanExecute(object parameter)
         {
-            return _canExecute != null ? _canExecute(parameter) : true;
+            try
+            {
+                return _canExecute != null ? _canExecute(parameter) : true;
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine("Error on CanExecute RelayCommand\n" + ex);
+                return false;
+            }
         }
 
         public virtual void Execute(object parameter)