temporarily revert change that might be causing an endless loop while MIDI monitoring/recording

git-svn-id: svn://localhost/ardour2/branches/3.0@10836 d708f5d6-7413-0410-9779-e7cbd77b26cf
2011-11-29 12:27:27 +00:00
parent a9a288b6a8
commit 8d2666e157
1 changed files with 1 additions and 1 deletions
--- 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;
 			}