# HG changeset patch
# User Chris Cannam
# Date 1401377272 -3600
# Node ID 5a66f4e5a3dcfe3e80211176bf2e8d90965e63f1
# Parent  36efd75d7b7b1bb88dbe6c15992b1ffe3e40d452# Parent  1d8cb0d92f4bb14231684f29fc329524f1aa065c
Merge from default branch

diff -r 36efd75d7b7b -r 5a66f4e5a3dc framework/MainWindowBase.cpp
--- a/framework/MainWindowBase.cpp	Wed May 14 09:58:27 2014 +0100
+++ b/framework/MainWindowBase.cpp	Thu May 29 16:27:52 2014 +0100
@@ -925,14 +925,14 @@
 
                 m_labeller->setSampleRate(sodm->getSampleRate());
 
-                if (m_labeller->actingOnPrevPoint()) {
+                if (m_labeller->actingOnPrevPoint() && havePrevPoint) {
                     command->deletePoint(prevPoint);
                 }
 
                 m_labeller->label<SparseOneDimensionalModel::Point>
                     (point, havePrevPoint ? &prevPoint : 0);
 
-                if (m_labeller->actingOnPrevPoint()) {
+                if (m_labeller->actingOnPrevPoint() && havePrevPoint) {
                     command->addPoint(prevPoint);
                 }
             }