diff -r 5f8d275750e7 -r 644e3cd48034 client/src/Iri.Modernisation.Controls/View/VideoViewer/VideoViewer.xaml.cs --- a/client/src/Iri.Modernisation.Controls/View/VideoViewer/VideoViewer.xaml.cs Fri Jan 08 11:33:24 2010 +0100 +++ b/client/src/Iri.Modernisation.Controls/View/VideoViewer/VideoViewer.xaml.cs Thu Jan 14 16:39:50 2010 +0100 @@ -108,7 +108,7 @@ void Play_Executed(object sender, SLExtensions.Input.ExecutedEventArgs e) { - if (e.Parameter == DataContext || e.Parameter == null) + if ((e.Parameter == DataContext || e.Parameter == null) && VideoScreen.Source != null) { _isPlayed = true; VideoScreen.Play();