From 8264084f6838911f12e5df3b4450ea76542a7f55 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 12 Jan 2013 04:41:22 +0000 Subject: Fix MIDI import. git-svn-id: http://svn.drobilla.net/lad/trunk/machina@4932 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/Machine.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/engine/Machine.cpp') diff --git a/src/engine/Machine.cpp b/src/engine/Machine.cpp index 92a0d7e..0792331 100644 --- a/src/engine/Machine.cpp +++ b/src/engine/Machine.cpp @@ -169,7 +169,7 @@ Machine::reset(MIDISink* sink, Raul::TimeStamp time) ++n) { SharedPtr node = (*n); - if (sink && node->is_active()) { + if (node->is_active()) { node->exit(sink, time); } @@ -196,8 +196,11 @@ Machine::earliest_node() const SharedPtr node = _active_nodes.at(i); if (node) { - assert(node->is_active()); - if (!earliest || ( node->exit_time() < earliest->exit_time()) ) { + if (!node->is_active()) { + std::cerr << "Inactive node in active node list" << std::endl; + continue; + } + if (!earliest || (node->exit_time() < earliest->exit_time()) ) { earliest = node; } } -- cgit v1.2.1