# HG changeset patch
# User matthiasm
# Date 1402915454 -3600
# Node ID 6f545a46746bd675e1b63f0eb1454bdd93209dbd
# Parent  6b57c58b88d2c030148aabde2dacb4189eeedee2
fixed deleteSelectionInclusive to not delete adjacent notes

diff -r 6b57c58b88d2 -r 6f545a46746b .hgsubstate
--- a/.hgsubstate	Mon Jun 16 09:28:12 2014 +0100
+++ b/.hgsubstate	Mon Jun 16 11:44:14 2014 +0100
@@ -4,4 +4,4 @@
 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
 f5c914661f6fdc7f05c2c980b0d21350d5933428 svapp
 85879408f6657f4076d73839d590c9fb80b78e73 svcore
-6eb0b20c940fe3475c3a847b10225ae720c7e958 svgui
+d6b79166ae0d6dcf0ed55aba08f50fdfcd229647 svgui
diff -r 6b57c58b88d2 -r 6f545a46746b src/MainWindow.cpp
--- a/src/MainWindow.cpp	Mon Jun 16 09:28:12 2014 +0100
+++ b/src/MainWindow.cpp	Mon Jun 16 11:44:14 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()+1);
+        isAtSelectionBoundary = (frame == sel.getStartFrame()) || (frame == sel.getEndFrame());
     }
     if (!doSelect || !isAtSelectionBoundary) {
         m_selectionAnchor = frame;
@@ -1257,9 +1257,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);
     }