merge
authorPAMPHILE Jonathan <pamphile@efrei.fr>
Tue, 17 Nov 2009 13:25:05 +0100
changeset 206 89813df17ec2
parent 205 468f3757f1f8 (diff)
parent 203 2948b34324bb (current diff)
child 207 6405d0b7d085
merge
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)));
         }
--- 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)