WinGui: General code tidy-up and fix a couple of possible points that could throw exceptions.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5083 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 8 insertions, 3 deletions

diff --git a/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs b/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs
index 77b0d858c..8a086ea09 100644
--- a/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs
+++ b/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs
@@ -60,10 +60,15 @@ namespace HandBrakeWPF.Views
         /// </param>

         protected override void OnClosing(System.ComponentModel.CancelEventArgs e)

         {

-            bool canClose = ((IShellViewModel)this.DataContext).CanClose();

-            if (!canClose)

+            IShellViewModel shellViewModel = this.DataContext as IShellViewModel;

+

+            if (shellViewModel != null)

             {

-                e.Cancel = true;

+                bool canClose = shellViewModel.CanClose();

+                if (!canClose)

+                {

+                    e.Cancel = true;

+                }

             }

 

             base.OnClosing(e);