# HG changeset patch
# User PAMPHILE Jonathan <pamphile@efrei.fr>
# Date 1258460705 -3600
# Node ID 89813df17ec25293212ed05ca9adfc436aa16763
# Parent  468f3757f1f8a966a5b8a8f9115fee4219bac246# Parent  2948b34324bb039eb4f13fbcc190e8b597d1c424
merge

diff -r 2948b34324bb -r 89813df17ec2 src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml.cs
--- a/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml.cs	Tue Nov 17 13:20:22 2009 +0100
+++ b/src/FingersDance.Control.SyncSource/UserControlSyncSource.xaml.cs	Tue Nov 17 13:25:05 2009 +0100
@@ -132,11 +132,11 @@
 
                 UserControlPlayer.Player.Position = ts;
                 UserControlPlayer.playerPlay();
-                UserControlPlayer.Time = (float)SliderValue / 1000;
 
                 UCTimeLine.IsDragging = false;
                 UCTimeLine.FinishedDragging = false;
             }
+            UserControlPlayer.Time = (float)SliderValue / 1000;
             DataDictionary Data = (new DataFactory()).Data;
             UserControlPlayer.ApplyColor(Data.GetColors((int)((float)SliderValue / 1000)));
         }
diff -r 2948b34324bb -r 89813df17ec2 src/FingersDance.GestureControl/GestureControl.cs
--- a/src/FingersDance.GestureControl/GestureControl.cs	Tue Nov 17 13:20:22 2009 +0100
+++ b/src/FingersDance.GestureControl/GestureControl.cs	Tue Nov 17 13:25:05 2009 +0100
@@ -163,8 +163,8 @@
                 {
                     this.RaiseGestureEvent(new Gesture{Start=start, End=time, Name=gesture});
                 }
+                start = -1;
                 _Gestures.Clear();
-                start = -1;
                 inProgess = null;
             }
             catch (Exception)