summaryrefslogtreecommitdiffstats
path: root/src/server/events
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2013-01-12 18:36:43 +0000
committerDavid Robillard <d@drobilla.net>2013-01-12 18:36:43 +0000
commit4e3f4a2a0fdca75352265ba8490fbe9f397e264a (patch)
tree925476d9d7b037494ae42d0923db0c69a1ff088b /src/server/events
parentd443ddb053141510311e002c59746a2dd9ba8b16 (diff)
downloadingen-4e3f4a2a0fdca75352265ba8490fbe9f397e264a.tar.gz
ingen-4e3f4a2a0fdca75352265ba8490fbe9f397e264a.tar.bz2
ingen-4e3f4a2a0fdca75352265ba8490fbe9f397e264a.zip
Fix connection bug introduced in r4918 (fix #875).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4936 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/server/events')
-rw-r--r--src/server/events/Connect.cpp2
-rw-r--r--src/server/events/Disconnect.cpp7
2 files changed, 4 insertions, 5 deletions
diff --git a/src/server/events/Connect.cpp b/src/server/events/Connect.cpp
index 16792a11..cbdb67c5 100644
--- a/src/server/events/Connect.cpp
+++ b/src/server/events/Connect.cpp
@@ -142,7 +142,7 @@ Connect::pre_process()
void
Connect::execute(ProcessContext& context)
{
- if (_status != Status::SUCCESS) {
+ if (_status == Status::SUCCESS) {
_head->add_arc(context, _arc.get());
_engine.maid()->dispose(_head->set_buffers(context, _buffers));
_head->connect_buffers();
diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp
index 4a961d9e..874e0d99 100644
--- a/src/server/events/Disconnect.cpp
+++ b/src/server/events/Disconnect.cpp
@@ -199,12 +199,11 @@ void
Disconnect::execute(ProcessContext& context)
{
if (_status == Status::SUCCESS) {
- if (!_impl->execute(context, true)) {
+ if (_impl->execute(context, true)) {
+ _graph->set_compiled_graph(_compiled_graph);
+ } else {
_status = Status::NOT_FOUND;
- return;
}
-
- _graph->set_compiled_graph(_compiled_graph);
}
}