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

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

diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc
index 7138d5258911ae24aad497fc06dc0d7b411eb6b8..f62a3b4c39a926489535294be36c982e50903896 100644 (file)
--- 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;
                        }