Merging with dev

1 files changed, 8 insertions, 0 deletions

diff --git a/binaryview.cpp b/binaryview.cpp
index a678d23b..e9e8b377 100644
--- a/binaryview.cpp
+++ b/binaryview.cpp
@@ -1739,6 +1739,7 @@ vector<LinearDisassemblyLine> BinaryView::GetPreviousLinearDisassemblyLines(Line
 		line.lineOffset = lines[i].lineOffset;
 		line.contents.addr = lines[i].contents.addr;
 		line.contents.instrIndex = lines[i].contents.instrIndex;
+		line.contents.highlight = lines[i].contents.highlight;
 		line.contents.tokens.reserve(lines[i].contents.count);
 		for (size_t j = 0; j < lines[i].contents.count; j++)
 		{
@@ -1788,6 +1789,7 @@ vector<LinearDisassemblyLine> BinaryView::GetNextLinearDisassemblyLines(LinearDi
 		line.lineOffset = lines[i].lineOffset;
 		line.contents.addr = lines[i].contents.addr;
 		line.contents.instrIndex = lines[i].contents.instrIndex;
+		line.contents.highlight = lines[i].contents.highlight;
 		line.contents.tokens.reserve(lines[i].contents.count);
 		for (size_t j = 0; j < lines[i].contents.count; j++)
 		{
@@ -1980,6 +1982,12 @@ void BinaryView::ShowHTMLReport(const string& title, const string& contents, con
 }
 
 
+void BinaryView::ShowGraphReport(const string& title, FlowGraph* graph)
+{
+	BNShowGraphReport(m_object, title.c_str(), graph->GetObject());
+}
+
+
 bool BinaryView::GetAddressInput(uint64_t& result, const string& prompt, const string& title)
 {
 	uint64_t currentAddress = 0;