From 8d2666e157a7d31f8edc3b7a8c8173a47596e519 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 29 Nov 2011 12:27:27 +0000 Subject: 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 --- libs/ardour/midi_buffer.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/ardour/midi_buffer.cc') diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc index 7138d52589..f62a3b4c39 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; } -- cgit v1.2.3