From 7795872be194c3b6f4e5f25366789a99eda14e7e Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Fri, 16 Apr 2021 13:24:34 +0200
Subject: [PATCH] ux: Fix jumping to addresses when base address is not 0x00

---
 source/views/view_hexeditor.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/views/view_hexeditor.cpp b/source/views/view_hexeditor.cpp
index 8605e773d..6299b8b26 100644
--- a/source/views/view_hexeditor.cpp
+++ b/source/views/view_hexeditor.cpp
@@ -140,11 +140,12 @@ namespace hex {
                 return;
 
             provider->setCurrentPage(page.value());
-            this->m_memoryEditor.GotoAddrAndHighlight(region.address, region.address + region.size - 1);
+            u64 start = region.address + provider->getBaseAddress();
+            this->m_memoryEditor.GotoAddrAndHighlight(start, start + region.size - 1);
             EventManager::post<EventRegionSelected>(region);
         });
 
-        EventManager::subscribe<EventProjectFileLoad>(this, [this]() {
+        EventManager::subscribe<EventProjectFileLoad>(this, []() {
             EventManager::post<EventFileDropped>(ProjectFile::getFilePath());
         });