resolve merge with master (?)

[ardour.git] / libs / evoral / src / libsmf / smf_load.c

diff --git a/libs/evoral/src/libsmf/smf_load.c b/libs/evoral/src/libsmf/smf_load.c
index fed4d28bb7effa542f7369e8203a54a5be610047..d5d9df9e26e408766f00e51a4aae7ba4bb6f1439 100644 (file)
--- a/libs/evoral/src/libsmf/smf_load.c
+++ b/libs/evoral/src/libsmf/smf_load.c
@@ -637,7 +637,7 @@ smf_event_is_textual(const smf_event_t *event)
        if (event->midi_buffer_length < 4)
                return (0);
 
-       if (event->midi_buffer[3] < 1 && event->midi_buffer[3] > 9)
+       if (event->midi_buffer[3] < 1 || event->midi_buffer[3] > 9)
                return (0);
 
        return (1);