From 7b25be51a5dc863b9410628f79bc251d5c5db72b Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Wed, 13 Mar 2024 16:38:44 +0100
Subject: [PATCH] fix: Base address issues with the data inspector and copy as
 array option

Fixes #1595
---
 plugins/builtin/source/content/views/view_data_inspector.cpp | 2 +-
 plugins/builtin/source/content/views/view_hex_editor.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/builtin/source/content/views/view_data_inspector.cpp b/plugins/builtin/source/content/views/view_data_inspector.cpp
index ff15f5aef..c57a2d505 100644
--- a/plugins/builtin/source/content/views/view_data_inspector.cpp
+++ b/plugins/builtin/source/content/views/view_data_inspector.cpp
@@ -29,7 +29,7 @@ namespace hex::plugin::builtin {
                 m_validBytes = 0;
                 m_selectedProvider = nullptr;
             } else {
-                m_validBytes   = u64(region.getProvider()->getActualSize() - region.address);
+                m_validBytes   = u64((region.getProvider()->getBaseAddress() + region.getProvider()->getActualSize()) - region.address);
                 m_startAddress = region.address;
                 m_selectedProvider = region.getProvider();
             }
diff --git a/plugins/builtin/source/content/views/view_hex_editor.cpp b/plugins/builtin/source/content/views/view_hex_editor.cpp
index 24d77bf55..302e41ede 100644
--- a/plugins/builtin/source/content/views/view_hex_editor.cpp
+++ b/plugins/builtin/source/content/views/view_hex_editor.cpp
@@ -1050,7 +1050,7 @@ namespace hex::plugin::builtin {
                     ImGui::SetClipboardText(
                             callback(
                                     provider,
-                                    selection->getStartAddress() + provider->getBaseAddress() + provider->getCurrentPageAddress(),
+                                    selection->getStartAddress(),
                                     selection->size
                             ).c_str()
                     );