# HG changeset patch
# User Chris Cannam
# Date 1402915745 -3600
# Node ID 80f2cd8a30f717d53c96f932c20fa60a3c8c66cd
# Parent  6d9adf82347da53c31e94928ca33908c92202e00# Parent  6f545a46746bd675e1b63f0eb1454bdd93209dbd
Merge

diff -r 6d9adf82347d -r 80f2cd8a30f7 .hgsubstate
--- a/.hgsubstate	Mon Jun 16 11:45:57 2014 +0100
+++ b/.hgsubstate	Mon Jun 16 11:49:05 2014 +0100
@@ -4,4 +4,4 @@
 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
 f5c914661f6fdc7f05c2c980b0d21350d5933428 svapp
 3efc20c59a947a137ed7fc715b2a3b0de6c02200 svcore
-102ffad481e6cf8d8cdf6dc42f09bc9593ec4c6d svgui
+8be221f1831388b523b88a74fb2e3d30d2d23291 svgui
diff -r 6d9adf82347d -r 80f2cd8a30f7 src/MainWindow.cpp
--- a/src/MainWindow.cpp	Mon Jun 16 11:45:57 2014 +0100
+++ b/src/MainWindow.cpp	Mon Jun 16 11:49:05 2014 +0100
@@ -1222,7 +1222,7 @@
     MultiSelection::SelectionList selections = m_viewManager->getSelections();
     if (!selections.empty()) {
         Selection sel = *selections.begin();
-        isAtSelectionBoundary = (frame == sel.getStartFrame()) || (frame == sel.getEndFrame()+1);
+        isAtSelectionBoundary = (frame == sel.getStartFrame()) || (frame == sel.getEndFrame());
     }
     if (!doSelect || !isAtSelectionBoundary) {
         m_selectionAnchor = frame;
@@ -1264,9 +1264,9 @@
     if (doSelect) {
         Selection sel;
         if (frame > m_selectionAnchor) {
-            sel = Selection(m_selectionAnchor, frame-1);
+            sel = Selection(m_selectionAnchor, frame);
         } else {
-            sel = Selection(frame, m_selectionAnchor-1);
+            sel = Selection(frame, m_selectionAnchor);
         }
         m_viewManager->setSelection(sel);
     }