# HG changeset patch
# User Chris Cannam
# Date 1402677898 -3600
# Node ID 1277a5dd11f66289529e8edc2cfbf8ded5ffd83e
# Parent  bcbad0f03f51a912f176c2d786c0974496ab73e6# Parent  05449a49cbb40844b52d73f0d32afc0f3a20309e
Merge

diff -r bcbad0f03f51 -r 1277a5dd11f6 .hgsubstate
--- a/.hgsubstate	Fri Jun 13 17:39:01 2014 +0100
+++ b/.hgsubstate	Fri Jun 13 17:44:58 2014 +0100
@@ -4,4 +4,4 @@
 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
 5302c548adadd5e3ddb5fd2eafa45ce3033183e7 svapp
 defbe5bc47b78b19914b4091aa724f9e5d39e055 svcore
-edada332c374cbb70f2ec94b6abc7b0a3257ae2f svgui
+6eb0b20c940fe3475c3a847b10225ae720c7e958 svgui
diff -r bcbad0f03f51 -r 1277a5dd11f6 src/MainWindow.cpp
--- a/src/MainWindow.cpp	Fri Jun 13 17:39:01 2014 +0100
+++ b/src/MainWindow.cpp	Fri Jun 13 17:44:58 2014 +0100
@@ -1215,7 +1215,7 @@
     MultiSelection::SelectionList selections = m_viewManager->getSelections();
     if (!selections.empty()) {
         Selection sel = *selections.begin();
-        isAtSelectionBoundary = (frame == sel.getStartFrame()) || (frame == sel.getEndFrame());
+        isAtSelectionBoundary = (frame == sel.getStartFrame()) || (frame == sel.getEndFrame()+1);
     }
     if (!doSelect || !isAtSelectionBoundary) {
         m_selectionAnchor = frame;
@@ -1257,9 +1257,9 @@
     if (doSelect) {
         Selection sel;
         if (frame > m_selectionAnchor) {
-            sel = Selection(m_selectionAnchor, frame);
+            sel = Selection(m_selectionAnchor, frame-1);
         } else {
-            sel = Selection(frame, m_selectionAnchor);
+            sel = Selection(frame, m_selectionAnchor-1);
         }
         m_viewManager->setSelection(sel);
     }