Improved graph layout algorithm, add trivial edges until edge routing is written

2 files changed, 4 insertions, 4 deletions

diff --git a/binaryninjaapi.h b/binaryninjaapi.h
index 4e6c09b3..113ecfc7 100644
--- a/binaryninjaapi.h
+++ b/binaryninjaapi.h
@@ -781,7 +781,7 @@ namespace BinaryNinja
 		void StartLayout();
 		bool IsLayoutComplete();
 		void OnComplete(const std::function<void()>& func);
-		void ClearOnComplete();
+		void Abort();
 
 		std::vector<Ref<FunctionGraphBlock>> GetBlocks() const;
 
diff --git a/functiongraph.cpp b/functiongraph.cpp
index 4e48e3cf..1f676618 100644
--- a/functiongraph.cpp
+++ b/functiongraph.cpp
@@ -13,7 +13,7 @@ FunctionGraph::~FunctionGraph()
 {
 	// This object is going away, so ensure that any pending completion routines are
 	// no longer called
-	ClearOnComplete();
+	Abort();
 
 	BNFreeFunctionGraph(m_graph);
 }
@@ -69,11 +69,11 @@ void FunctionGraph::OnComplete(const std::function<void()>& func)
 }
 
 
-void FunctionGraph::ClearOnComplete()
+void FunctionGraph::Abort()
 {
 	// Must clear the callback with the core before clearing our own function object, as until it
 	// is cleared in the core it can be called at any time from a different thread.
-	BNClearFunctionGraphCompleteCallback(m_graph);
+	BNAbortFunctionGraph(m_graph);
 	m_completeFunc = []() {};
 }