Merge branch 'dev' into dev

1 files changed, 4 insertions, 0 deletions

diff --git a/function.cpp b/function.cpp
index 109b6f49..b1d008ee 100644
--- a/function.cpp
+++ b/function.cpp
@@ -567,6 +567,10 @@ vector<vector<InstructionTextToken>> Function::GetBlockAnnotations(Architecture*
 			token.type = lines[i].tokens[j].type;
 			token.text = lines[i].tokens[j].text;
 			token.value = lines[i].tokens[j].value;
+			token.size = lines[i].tokens[j].size;
+			token.operand = lines[i].tokens[j].operand;
+			token.context = lines[i].tokens[j].context;
+			token.address = lines[i].tokens[j].address;
 			line.push_back(token);
 		}
 		result.push_back(line);