1 files changed, 45 insertions, 35 deletions

diff --git a/src/server/events/DisconnectAll.cpp b/src/server/events/DisconnectAll.cpp
index 86a38d7b..5f0e9a5e 100644
--- a/src/server/events/DisconnectAll.cpp
+++ b/src/server/events/DisconnectAll.cpp
@@ -32,17 +32,13 @@
 #include "ingen/Node.hpp"
 #include "ingen/Status.hpp"
 #include "ingen/Store.hpp"
-#include "raul/Maid.hpp"
 
-#include <map>
 #include <memory>
 #include <mutex>
 #include <set>
 #include <utility>
 
-namespace ingen {
-namespace server {
-namespace events {
+namespace ingen::server::events {
 
 DisconnectAll::DisconnectAll(Engine&                           engine,
                              const std::shared_ptr<Interface>& client,
@@ -54,8 +50,7 @@ DisconnectAll::DisconnectAll(Engine&                           engine,
     , _block(nullptr)
     , _port(nullptr)
     , _deleting(false)
-{
-}
+{}
 
 /** Internal version for use by other events.
  */
@@ -68,8 +63,7 @@ DisconnectAll::DisconnectAll(Engine&    engine,
 	, _block(dynamic_cast<BlockImpl*>(object))
 	, _port(dynamic_cast<PortImpl*>(object))
 	, _deleting(true)
-{
-}
+{}
 
 DisconnectAll::~DisconnectAll()
 {
@@ -113,32 +107,29 @@ DisconnectAll::pre_process(PreProcessContext& ctx)
 		}
 	}
 
-	// Find set of arcs to remove
-	std::set<ArcImpl*> to_remove;
-	for (const auto& a : _parent->arcs()) {
-		auto* const arc = static_cast<ArcImpl*>(a.second.get());
-		if (_block) {
-			if (arc->tail()->parent_block() == _block
-			    || arc->head()->parent_block() == _block) {
-				to_remove.insert(arc);
-			}
-		} else if (_port) {
-			if (arc->tail() == _port || arc->head() == _port) {
-				to_remove.insert(arc);
-			}
-		}
+	// Create disconnect events to erase adjacent arcs in parent
+	for (const auto& a : adjacent_arcs(_parent)) {
+		_impls.push_back(
+			new Disconnect::Impl(_engine,
+			                     _parent,
+			                     dynamic_cast<PortImpl*>(a->tail()),
+			                     dynamic_cast<InputPort*>(a->head())));
 	}
 
-	// Create disconnect events (which erases from _parent->arcs())
-	for (const auto& a : to_remove) {
-		_impls.push_back(new Disconnect::Impl(
-			                 _engine, _parent,
-			                 dynamic_cast<PortImpl*>(a->tail()),
-			                 dynamic_cast<InputPort*>(a->head())));
+	// Create disconnect events to erase adjacent arcs in parent's parent
+	if (_port && _parent->parent()) {
+		auto* const parent_parent = dynamic_cast<GraphImpl*>(_parent->parent());
+		for (const auto& a : adjacent_arcs(parent_parent)) {
+			_impls.push_back(
+				new Disconnect::Impl(_engine,
+				                     parent_parent,
+				                     dynamic_cast<PortImpl*>(a->tail()),
+				                     dynamic_cast<InputPort*>(a->head())));
+		}
 	}
 
 	if (!_deleting && ctx.must_compile(*_parent)) {
-		if (!(_compiled_graph = compile(*_engine.maid(), *_parent))) {
+		if (!(_compiled_graph = compile(*_parent))) {
 			return Event::pre_process_done(Status::COMPILATION_FAILED);
 		}
 	}
@@ -157,14 +148,14 @@ DisconnectAll::execute(RunContext& ctx)
 	}
 
 	if (_compiled_graph) {
-		_parent->set_compiled_graph(std::move(_compiled_graph));
+		_compiled_graph = _parent->swap_compiled_graph(std::move(_compiled_graph));
 	}
 }
 
 void
 DisconnectAll::post_process()
 {
-	Broadcaster::Transfer t(*_engine.broadcaster());
+	const Broadcaster::Transfer t{*_engine.broadcaster()};
 	if (respond() == Status::SUCCESS) {
 		_engine.broadcaster()->message(_msg);
 	}
@@ -178,6 +169,25 @@ DisconnectAll::undo(Interface& target)
 	}
 }
 
-} // namespace events
-} // namespace server
-} // namespace ingen
+std::set<ArcImpl*>
+DisconnectAll::adjacent_arcs(GraphImpl* const graph)
+{
+	std::set<ArcImpl*> arcs;
+	for (const auto& a : graph->arcs()) {
+		auto* const arc = static_cast<ArcImpl*>(a.second.get());
+		if (_block) {
+			if (arc->tail()->parent_block() == _block
+			    || arc->head()->parent_block() == _block) {
+				arcs.insert(arc);
+			}
+		} else if (_port) {
+			if (arc->tail() == _port || arc->head() == _port) {
+				arcs.insert(arc);
+			}
+		}
+	}
+
+	return arcs;
+}
+
+} // namespace ingen::server::events