From 083b17d6e594062f61d78f6e1e30d16aaf849078 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 5 Jan 2008 23:44:41 +0000 Subject: Fix connecting mismatched ports bug (closes ticket 129). Fix command line --help output to match reality. git-svn-id: http://svn.drobilla.net/lad/ingen@1011 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/engine/events/ConnectionEvent.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libs') diff --git a/src/libs/engine/events/ConnectionEvent.cpp b/src/libs/engine/events/ConnectionEvent.cpp index fa8b0f17..4c8e7f72 100644 --- a/src/libs/engine/events/ConnectionEvent.cpp +++ b/src/libs/engine/events/ConnectionEvent.cpp @@ -69,9 +69,9 @@ ConnectionEvent::pre_process() return; } - if (_src_port->type() != _dst_port->type() - && !( (_src_port->type() != DataType::AUDIO || _src_port->type() != DataType::CONTROL) - && (_dst_port->type() != DataType::AUDIO || _dst_port->type() != DataType::CONTROL) )) { + if ( ! (_src_port->type() == _dst_port->type() + || ( (_src_port->type() == DataType::CONTROL || _src_port->type() == DataType::AUDIO) + && (_dst_port->type() == DataType::CONTROL || _dst_port->type() == DataType::AUDIO) ))) { _error = TYPE_MISMATCH; QueuedEvent::pre_process(); return; -- cgit v1.2.1