# HG changeset patch
# User Chris Cannam
# Date 1402592039 -3600
# Node ID ecd430813eae83dad27be17cc7674f65f5335319
# Parent  af77bfeaa1598d3828362037228173cd1e4a8d95# Parent  6045288159e942aa6d595a7954123e6d8ee25169
Merge

diff -r af77bfeaa159 -r ecd430813eae src/MainWindow.cpp
--- a/src/MainWindow.cpp	Thu Jun 12 17:52:03 2014 +0100
+++ b/src/MainWindow.cpp	Thu Jun 12 17:53:59 2014 +0100
@@ -1126,7 +1126,13 @@
     
     Pane *p = m_analyser->getPane();
 
-    if (!doSelect) {
+    bool isAtSelectionBoundary = false;
+    MultiSelection::SelectionList selections = m_viewManager->getSelections();
+    if (!selections.empty()) {
+        Selection sel = *selections.begin();
+        isAtSelectionBoundary = (frame == sel.getStartFrame()) || (frame == sel.getEndFrame());
+    }
+    if (!doSelect || !isAtSelectionBoundary) {
         m_selectionAnchor = frame;
     }