merge

Author: ButchersBoy

MaterialDesignThemes.Wpf/DialogHost.cs

@@ -197,13 +197,13 @@ public static async Task<object> Show(object content, object dialogIndetifier, D
 
             return targets[0]._closeDialogExecutionParameter;
         }
-        
+
         public DialogHost()
         {
             Loaded += OnLoaded;
             Unloaded += OnUnloaded;
 
-            CommandBindings.Add(new CommandBinding(CloseDialogCommand, CloseDialogHandler));
+            CommandBindings.Add(new CommandBinding(CloseDialogCommand, CloseDialogHandler, CloseDialogCanExecute));
             CommandBindings.Add(new CommandBinding(OpenDialogCommand, OpenDialogHandler));
         }
 
@@ -503,6 +503,11 @@ private void OpenDialogHandler(object sender, ExecutedRoutedEventArgs executedRo
             executedRoutedEventArgs.Handled = true;
         }
 
+        private void CloseDialogCanExecute(object sender, CanExecuteRoutedEventArgs canExecuteRoutedEventArgs)
+        {
+            canExecuteRoutedEventArgs.CanExecute = _session != null;
+        }
+
         private void CloseDialogHandler(object sender, ExecutedRoutedEventArgs executedRoutedEventArgs)
         {
             if (executedRoutedEventArgs.Handled) return;