Merge branch 'dev'

1 files changed, 7 insertions, 0 deletions

diff --git a/basicblock.cpp b/basicblock.cpp
index c2a2bddf..89ace134 100644
--- a/basicblock.cpp
+++ b/basicblock.cpp
@@ -160,6 +160,12 @@ bool BasicBlock::HasUndeterminedOutgoingEdges() const
 }
 
 
+bool BasicBlock::CanExit() const
+{
+	return BNBasicBlockCanExit(m_object);
+}
+
+
 set<Ref<BasicBlock>> BasicBlock::GetDominators() const
 {
 	size_t count;
@@ -276,6 +282,7 @@ vector<DisassemblyTextLine> BasicBlock::GetDisassemblyText(DisassemblySettings*
 			token.size = lines[i].tokens[j].size;
 			token.operand = lines[i].tokens[j].operand;
 			token.context = lines[i].tokens[j].context;
+			token.confidence = lines[i].tokens[j].confidence;
 			token.address = lines[i].tokens[j].address;
 			line.tokens.push_back(token);
 		}