--- a/client/src/Iri.Modernisation.Controls/View/VideoViewer/VideoViewer.xaml.cs	Fri Dec 18 16:45:30 2009 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/VideoViewer/VideoViewer.xaml.cs	Tue Dec 22 16:22:22 2009 +0100
@@ -52,8 +52,8 @@
 
         void VideoScreen_MediaOpened(object sender, RoutedEventArgs e)
         {
-            VideoScreen.Play();
-            VideoPositionTimer.Start();
+            //VideoScreen.Play();
+            //VideoPositionTimer.Start();
             
         }
 
@@ -66,10 +66,10 @@
         {
             if (e.Source == DataContext && e.Source != null)
             {
-                
+                if(!VideoPositionTimer.IsEnabled)
                 VideoPositionTimer.Start();
                
-               VideoScreen.Position = new TimeSpan(((TimeSpan)e.Parameter).Ticks);
+               VideoScreen.Position = ((TimeSpan)e.Parameter);
                
               
             }
@@ -99,10 +99,8 @@
                 VideoScreen.Pause();
                 _isPlayed = false;
                 VideoPositionTimer.Stop();
-                if (VideoPositionTimer.IsEnabled)
-                {
-                    MessageBox.Show("Click Time IS NOT STOPPED");
-                }
+                if(DataContext!=null)
+                ((VideoViewerVM)DataContext).AutoPlay = false;
             }
         }
 
@@ -113,6 +111,7 @@
                 _isPlayed = true;
                 VideoScreen.Play();
                 VideoPositionTimer.Start();
+                ((VideoViewerVM)DataContext).AutoPlay = true;
             }
         }