From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 22 Nov 2011 20:29:12 +0000 (+0000)
Subject: fix mis-ordering of MIDI events when merging MidiBuffers in-place
X-Git-Tag: 3.0-beta2~371
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=b27200688b1520fbcba7e6e5b555ae95f1fc4bf1;hp=d1cfe482a86f3b6b1e0b26310cc2ece3f177e4a4;p=ardour.git

fix mis-ordering of MIDI events when merging MidiBuffers in-place

git-svn-id: svn://localhost/ardour2/branches/3.0@10779 d708f5d6-7413-0410-9779-e7cbd77b26cf
---

diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc
index f62a3b4c39..7138d52589 100644
--- a/libs/ardour/midi_buffer.cc
+++ b/libs/ardour/midi_buffer.cc
@@ -318,7 +318,7 @@ MidiBuffer::merge_in_place(const MidiBuffer &other)
 		   the event referenced by "us"
 		*/
 
-		while (them != other.end() && (*them).time() <= (*us).time()) {
+		while (them != other.end() && (*them).time() < (*us).time()) {
 			if (src == -1) {
 				src = them.offset;
 			}