Fix issue where old window objects would stick around and continue to respond

to property change events and mess things up.

--HG--
branch : beta

Author: RandomEngy

Installer/latest-beta.xml

@@ -1,12 +1,12 @@
 <UpdateInfo>
 	<Release>
-		<Latest>1.4.0</Latest>
-		<DownloadLocation>http://engy.us/VidCoder/VidCoder-1.4.0-Beta-x86.exe</DownloadLocation>
-		<ChangelogLocation>http://vidcoder.codeplex.com/releases/view/94767</ChangelogLocation>
+		<Latest>1.4.1</Latest>
+		<DownloadLocation>http://engy.us/VidCoder/VidCoder-1.4.1-Beta-x86.exe</DownloadLocation>
+		<ChangelogLocation>http://vidcoder.codeplex.com/releases/view/95207</ChangelogLocation>
 	</Release>
 	<Release-x64>
-		<Latest>1.4.0</Latest>
-		<DownloadLocation>http://engy.us/VidCoder/VidCoder-1.4.0-Beta-x64.exe</DownloadLocation>
-		<ChangelogLocation>http://vidcoder.codeplex.com/releases/view/94767</ChangelogLocation>
+		<Latest>1.4.1</Latest>
+		<DownloadLocation>http://engy.us/VidCoder/VidCoder-1.4.1-Beta-x64.exe</DownloadLocation>
+		<ChangelogLocation>http://vidcoder.codeplex.com/releases/view/95207</ChangelogLocation>
 	</Release-x64>
 </UpdateInfo>

VidCoder/Converters/FramerateDisplayConverter.cs

@@ -11,7 +11,7 @@ public class FramerateDisplayConverter : IValueConverter
 	{
 		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
 		{
-			if (value == null)
+			if (value == null || value as string == string.Empty)
 			{
 				return string.Empty;
 			}

VidCoder/View/AboutDialog.xaml

@@ -14,7 +14,7 @@
 			<TextBlock HorizontalAlignment="Left" Name="versionLabel" Text="Version" VerticalAlignment="Top"  />
 			<TextBlock Text="{Binding Version}" Margin="5,0,0,0" Name="versionText" />
 		</StackPanel>
-		<TextBlock Height="23" HorizontalAlignment="Left" Margin="171,79,0,0" Name="textBlock3" Text="Based on HandBrake (svn 4937)" VerticalAlignment="Top" />
+		<TextBlock Height="23" HorizontalAlignment="Left" Margin="171,79,0,0" Name="textBlock3" Text="Based on HandBrake (svn 4971)" VerticalAlignment="Top" />
 		<TextBlock Height="23" HorizontalAlignment="Left" Margin="171,108,0,0" Name="textBlock2" Text="© 2010-2012 VidCoder Developers" VerticalAlignment="Top" />
 		<Label Content="License:" Height="28" HorizontalAlignment="Left" Margin="12,138,0,0" Name="label1" VerticalAlignment="Top" />
 

VidCoder/View/EncodingWindow.xaml

@@ -12,7 +12,7 @@
 	Title="{Binding WindowTitle}" Width="671" Height="467" MinWidth="588" MinHeight="467"
 	Style="{StaticResource NormalWindow}" WindowStartupLocation="CenterOwner"
 	Closing="Window_Closing"
-	ShowInTaskbar="False" WindowStyle="ToolWindow">
+	ShowInTaskbar="False" WindowStyle="ToolWindow" Closed="Window_Closed">
 	<Window.Resources>
 		<local:EnumDisplayer Type="{x:Type Encoding:Container}" x:Key="OutputFormatChoices" />
 	</Window.Resources>

VidCoder/View/EncodingWindow.xaml.cs

@@ -64,5 +64,10 @@ private void ToolBar_Loaded(object sender, RoutedEventArgs e)
 		{
 			UIUtilities.HideOverflowGrid(sender as ToolBar);
 		}
+
+		private void Window_Closed(object sender, EventArgs e)
+		{
+			this.DataContext = null;
+		}
 	}
 }

VidCoder/View/OptionsDialog.xaml

@@ -2,7 +2,7 @@
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Model="clr-namespace:VidCoder.Model" Title="Options" Height="415" Width="571"
 	xmlns:resx="clr-namespace:VidCoder.Properties"
-	Style="{StaticResource NormalWindow}" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" Closing="Window_Closing" xmlns:my="clr-namespace:VidCoder.Controls">
+	Style="{StaticResource NormalWindow}" WindowStartupLocation="CenterOwner" ResizeMode="NoResize" Closing="Window_Closing" xmlns:my="clr-namespace:VidCoder.Controls" Closed="Window_Closed">
 	<Window.Resources>
 		<Style x:Key="EmphasizedTitle" TargetType="TextBlock">
 			<Setter Property="VerticalAlignment" Value="Center" />

VidCoder/View/OptionsDialog.xaml.cs

@@ -33,5 +33,10 @@ private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs
 			Settings.Default.OptionsDialogLastTab = this.tabControl.SelectedIndex;
 			Settings.Default.Save();
 		}
+
+		private void Window_Closed(object sender, EventArgs e)
+		{
+			this.DataContext = null;
+		}
 	}
 }

VidCoder/ViewModel/OkCancelDialogViewModel.cs

@@ -26,12 +26,9 @@ public virtual void OnClosing()
 				this.Closing();
 			}
 
-			this.Closed = true;
 			WindowManager.ReportClosed(this);
 		}
 
-		public bool Closed { get; set; }
-
 		public bool DialogResult { get; set; }
 		public Action Closing { get; set; }
 

VidCoder/ViewModel/OptionsDialogViewModel.cs

@@ -350,12 +350,6 @@ public bool MinimizeToTray
 
 			set
 			{
-				// WPF will sometimes fire the setter after the window has closed.
-				if (this.Closed)
-				{
-					return;
-				}
-
 				this.minimizeToTray = value;
 				this.RaisePropertyChanged(() => this.MinimizeToTray);
 			}

VidCoder/ViewModel/Panels/VideoPanelViewModel.cs

@@ -266,12 +266,6 @@ public bool ConstantFramerate
 
 			set
 			{
-				// WPF will errantly try to set this sometimes after it's closed
-				if (this.EncodingViewModel.Closed)
-				{
-					return;
-				}
-
 				this.Profile.ConstantFramerate = value;
 				this.RaisePropertyChanged(() => this.ConstantFramerate);
 				this.IsModified = true;