fix can execute changed

mes51 · Nov 4, 2018 · 4fac353 · 4fac353
1 parent 7e4ced8
commit 4fac353
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/Intervallo/Command/CommandBase.cs b/Intervallo/Command/CommandBase.cs
@@ -15,7 +15,21 @@ public CommandBase(MainWindow window)
             Window = window;
         }
 
-        public event EventHandler CanExecuteChanged;
+        event EventHandler InternalCanExecuteChanged;
+
+        public event EventHandler CanExecuteChanged
+        {
+            add
+            {
+                CommandManager.RequerySuggested += value;
+                InternalCanExecuteChanged += value;
+            }
+            remove
+            {
+                CommandManager.RequerySuggested -= value;
+                InternalCanExecuteChanged -= value;
+            }
+        }
 
         protected MainWindow Window { get; }
 
@@ -29,7 +43,7 @@ public virtual bool CanExecute(object parameter)
         // XXX: change access level to protected
         public void OnCanExecuteChanged()
         {
-            CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+            InternalCanExecuteChanged?.Invoke(this, EventArgs.Empty);
         }
     }
 }