From 4c8efed256bc542dbd231b46c8ffdbb846b39a9a Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Thu, 17 Feb 2022 21:49:40 +0100
Subject: [PATCH] fix: Crashing when scrolling through the hex editor too
 quickly

---
 lib/external/imgui/include/imgui_memory_editor.h         | 3 ++-
 plugins/builtin/source/content/views/view_hex_editor.cpp | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/external/imgui/include/imgui_memory_editor.h b/lib/external/imgui/include/imgui_memory_editor.h
index befe640ea..d823d6f6d 100644
--- a/lib/external/imgui/include/imgui_memory_editor.h
+++ b/lib/external/imgui/include/imgui_memory_editor.h
@@ -49,6 +49,7 @@
 
 #include <hex.hpp>
 #include <hex/api/event.hpp>
+#include <hex/helpers/logger.hpp>
 
 #include <string>
 
@@ -687,7 +688,7 @@ struct MemoryEditor
                 }
             }
         }
-        IM_ASSERT(clipper.Step() == false);
+        clipper.Step();
         clipper.End();
         ImGui::PopStyleVar(2);
         ImGui::EndChild();
diff --git a/plugins/builtin/source/content/views/view_hex_editor.cpp b/plugins/builtin/source/content/views/view_hex_editor.cpp
index 34f369e31..2fbec9c34 100644
--- a/plugins/builtin/source/content/views/view_hex_editor.cpp
+++ b/plugins/builtin/source/content/views/view_hex_editor.cpp
@@ -124,8 +124,6 @@ namespace hex::plugin::builtin {
                 }
 
                 _this->m_highlights.push_back(std::move(newBlock));
-
-                return _this->m_memoryEditor.HighlightFn(data, off, next);
             }
 
             if (next && prevColor != currColor) {