From 6709baa710659075a16654d3dbf39937a6cc78ba Mon Sep 17 00:00:00 2001 From: WerWolv Date: Sat, 13 May 2023 15:43:37 +0200 Subject: [PATCH] patterns: Updated pattern language --- lib/external/pattern_language | 2 +- .../source/content/views/view_pattern_data.cpp | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/external/pattern_language b/lib/external/pattern_language index 9f868f9a3..b0980f394 160000 --- a/lib/external/pattern_language +++ b/lib/external/pattern_language @@ -1 +1 @@ -Subproject commit 9f868f9a362c9c4f64b8f85440033364e001b12d +Subproject commit b0980f39494de14cb3ee4acbf7d8b83eb5009c12 diff --git a/plugins/builtin/source/content/views/view_pattern_data.cpp b/plugins/builtin/source/content/views/view_pattern_data.cpp index 39a934a06..c83c20373 100644 --- a/plugins/builtin/source/content/views/view_pattern_data.cpp +++ b/plugins/builtin/source/content/views/view_pattern_data.cpp @@ -35,15 +35,17 @@ namespace hex::plugin::builtin { if (ImGui::Begin(View::toWindowName("hex.builtin.view.pattern_data.name").c_str(), &this->getWindowOpenState(), ImGuiWindowFlags_NoCollapse)) { if (ImHexApi::Provider::isValid()) { auto &runtime = ContentRegistry::PatternLanguage::getRuntime(); - if (TRY_LOCK(ContentRegistry::PatternLanguage::getRuntimeLock()) || !runtime.arePatternsValid()) { + if (!runtime.arePatternsValid()) { this->m_patternDrawer.draw({}); } else { - if (this->m_shouldReset) { - this->m_patternDrawer.reset(); - this->m_shouldReset = false; - } + if (TRY_LOCK(ContentRegistry::PatternLanguage::getRuntimeLock())) { + if (this->m_shouldReset) { + this->m_patternDrawer.reset(); + this->m_shouldReset = false; + } - this->m_patternDrawer.draw(runtime.getPatterns()); + this->m_patternDrawer.draw(runtime.getPatterns()); + } } } }