Merge branch 'master' of github.com:bhaviksingh/Choreoh

bhaviksingh · May 1, 2012 · 2ed9c26 · 2ed9c26
2 parents 259b7b2 + 9b117c3
commit 2ed9c26
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/Choreoh/MainWindow.xaml.cs b/Choreoh/MainWindow.xaml.cs
@@ -440,6 +440,8 @@ private void deleteSegmentButton_Clicked(object sender, EventArgs e)
         private void cancelSegmentButton_Clicked(object sender, EventArgs e)
         {
             cancelActionButton_Clicked(sender, e);
+            waveform.selectStart(0);
+            waveform.selectEnd(1);
             waveform.deselectSegment();
             fixSegmentIndices();
         }
@@ -1567,6 +1569,15 @@ private void cancelActionButton_Clicked(object sender, EventArgs e)
             showAllSegments();
             cancelActionCanvas.Visibility = Visibility.Collapsed;
             Canvas.SetZIndex(timelineCanvas, oldButtonZIndex);
+
+            isSelectingEndSegment = false;
+            isSelectingPlaySegment = false;
+            isSelectingPlaySongSelection = false;
+            isSelectingRecordSegment = false;
+            isSelectingStartSegment = false;
+            waveform.selectStart(0);
+            waveform.selectEnd(1);
+            waveform.deselectSegment();
         }
 
     }