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);
 	}
 }