From fbd6d6b9fc2fd660fc8f7f070cb52f7d0f683c0b Mon Sep 17 00:00:00 2001 From: paxcut <53811119+paxcut@users.noreply.github.com> Date: Mon, 9 Mar 2026 21:46:51 -0700 Subject: [PATCH] fix: popup when highlighting was cancelled (#2678) Popup was caused by old code that set the interrupt flag when the exception was caught in the thread and was already fixed in the code folding branch. --- .../source/content/text_highlighting/pattern_language.cpp | 3 --- .../builtin/source/content/views/view_pattern_editor.cpp | 6 +----- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/plugins/builtin/source/content/text_highlighting/pattern_language.cpp b/plugins/builtin/source/content/text_highlighting/pattern_language.cpp index fdea61e3b..7304706bf 100644 --- a/plugins/builtin/source/content/text_highlighting/pattern_language.cpp +++ b/plugins/builtin/source/content/text_highlighting/pattern_language.cpp @@ -2556,10 +2556,7 @@ namespace hex::plugin::builtin { } } catch (const std::out_of_range &e) { log::debug("TextHighlighter::highlightSourceCode: Out of range error: {}", e.what()); - m_viewPatternEditor->interrupt(); return; } - - return; } } diff --git a/plugins/builtin/source/content/views/view_pattern_editor.cpp b/plugins/builtin/source/content/views/view_pattern_editor.cpp index 6880058b6..69e3d4e21 100644 --- a/plugins/builtin/source/content/views/view_pattern_editor.cpp +++ b/plugins/builtin/source/content/views/view_pattern_editor.cpp @@ -1479,11 +1479,7 @@ namespace hex::plugin::builtin { interrupt(); else if (m_runningHighlighters == 0 && m_changesWereParsed && !m_changesWereColored && !m_allStepsCompleted) { m_textHighlighter.get(provider).setViewPatternEditor(this); - try { - m_textHighlighter.get(provider).updateRequiredInputs(); - } catch (...) { - - } + m_textHighlighter.get(provider).updateRequiredInputs(); TaskManager::createBackgroundTask("HighlightSourceCode", [this,provider](auto &) { m_textHighlighter.get(provider).highlightSourceCode(); }); } else if (m_changesWereColored && !m_allStepsCompleted) { m_textHighlighter.get(provider).setRequestedIdentifierColors();