1 files changed, 16 insertions, 17 deletions

diff --git a/src/server/events/Disconnect.cpp b/src/server/events/Disconnect.cpp
index 93e271af..e0db262a 100644
--- a/src/server/events/Disconnect.cpp
+++ b/src/server/events/Disconnect.cpp
@@ -35,20 +35,19 @@
 #include "ingen/Node.hpp"
 #include "ingen/Status.hpp"
 #include "ingen/Store.hpp"
-#include "ingen/memory.hpp"
 #include "raul/Array.hpp"
 #include "raul/Maid.hpp"
 #include "raul/Path.hpp"
 
 #include <cassert>
 #include <cstdint>
+#include <memory>
 #include <mutex>
 #include <set>
 #include <string>
 #include <utility>
 
-namespace ingen {
-namespace server {
+namespace ingen::server {
 
 class RunContext;
 
@@ -60,9 +59,7 @@ Disconnect::Disconnect(Engine&                           engine,
                        const ingen::Disconnect&          msg)
 	: Event(engine, client, msg.seq, timestamp)
 	, _msg(msg)
-	, _graph(nullptr)
-{
-}
+{}
 
 Disconnect::~Disconnect() = default;
 
@@ -120,7 +117,7 @@ Disconnect::Impl::Impl(Engine&     e,
 bool
 Disconnect::pre_process(PreProcessContext& ctx)
 {
-	std::lock_guard<Store::Mutex> lock(_engine.store()->mutex());
+	const std::lock_guard<Store::Mutex> lock{_engine.store()->mutex()};
 
 	if (_msg.tail.parent().parent() != _msg.head.parent().parent()
 	    && _msg.tail.parent() != _msg.head.parent().parent()
@@ -159,7 +156,9 @@ Disconnect::pre_process(PreProcessContext& ctx)
 
 	if (!_graph) {
 		return Event::pre_process_done(Status::INTERNAL_ERROR, _msg.head);
-	} else if (!_graph->has_arc(tail, head)) {
+	}
+
+	if (!_graph->has_arc(tail, head)) {
 		return Event::pre_process_done(Status::NOT_FOUND, _msg.head);
 	}
 
@@ -167,12 +166,12 @@ Disconnect::pre_process(PreProcessContext& ctx)
 		return Event::pre_process_done(Status::PARENT_NOT_FOUND, _msg.head);
 	}
 
-	_impl = make_unique<Impl>(_engine,
-	                          _graph,
-	                          dynamic_cast<PortImpl*>(tail),
-	                          dynamic_cast<InputPort*>(head));
+	_impl = std::make_unique<Impl>(_engine,
+	                               _graph,
+	                               dynamic_cast<PortImpl*>(tail),
+	                               dynamic_cast<InputPort*>(head));
 
-	_compiled_graph = ctx.maybe_compile(*_engine.maid(), *_graph);
+	_compiled_graph = ctx.maybe_compile(*_graph);
 
 	return Event::pre_process_done(Status::SUCCESS);
 }
@@ -209,7 +208,8 @@ Disconnect::execute(RunContext& ctx)
 	if (_status == Status::SUCCESS) {
 		if (_impl->execute(ctx, true)) {
 			if (_compiled_graph) {
-				_graph->set_compiled_graph(std::move(_compiled_graph));
+				_compiled_graph =
+				    _graph->swap_compiled_graph(std::move(_compiled_graph));
 			}
 		} else {
 			_status = Status::NOT_FOUND;
@@ -220,7 +220,7 @@ Disconnect::execute(RunContext& ctx)
 void
 Disconnect::post_process()
 {
-	Broadcaster::Transfer t(*_engine.broadcaster());
+	const Broadcaster::Transfer t{*_engine.broadcaster()};
 	if (respond() == Status::SUCCESS) {
 		_engine.broadcaster()->message(_msg);
 	}
@@ -233,5 +233,4 @@ Disconnect::undo(Interface& target)
 }
 
 } // namespace events
-} // namespace server
-} // namespace ingen
+} // namespace ingen::server