summaryrefslogtreecommitdiffstats
path: root/src/libs
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-01-05 23:44:41 +0000
committerDavid Robillard <d@drobilla.net>2008-01-05 23:44:41 +0000
commit083b17d6e594062f61d78f6e1e30d16aaf849078 (patch)
treece52c6fe88119c7fe5df42f40f779f6d191301b4 /src/libs
parent7fd21f2bce2b86c7b735a108391bda3dcfbb3455 (diff)
downloadingen-083b17d6e594062f61d78f6e1e30d16aaf849078.tar.gz
ingen-083b17d6e594062f61d78f6e1e30d16aaf849078.tar.bz2
ingen-083b17d6e594062f61d78f6e1e30d16aaf849078.zip
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
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/engine/events/ConnectionEvent.cpp6
1 files changed, 3 insertions, 3 deletions
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;