[4.4.4] [ioc] fixed Inject get method

musescore · Nov 27, 2024 · b790329 · b790329
1 parent c55e4da
commit b790329
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/framework/global/thirdparty/kors_modularity/modularity/ioc.cpp b/src/framework/global/thirdparty/kors_modularity/modularity/ioc.cpp
@@ -23,7 +23,7 @@ SOFTWARE.
 */
 #include "ioc.h"
 
-std::mutex kors::modularity::StaticMutex::mutex;
+std::recursive_mutex kors::modularity::StaticMutex::mutex;
 
 static std::map<kors::modularity::IoCID, kors::modularity::ModulesIoC*> s_map;
 

diff --git a/src/framework/global/thirdparty/kors_modularity/modularity/ioc.h b/src/framework/global/thirdparty/kors_modularity/modularity/ioc.h
@@ -37,7 +37,7 @@ void removeIoC(const ContextPtr& ctx = nullptr);
 
 struct StaticMutex
 {
-    static std::mutex mutex;
+    static std::recursive_mutex mutex;
 };
 
 template<class I>
@@ -74,7 +74,7 @@ class Inject
     const std::shared_ptr<I>& get() const
     {
         if (!m_i) {
-            const std::lock_guard<std::mutex> lock(StaticMutex::mutex);
+            const std::lock_guard<std::recursive_mutex> lock(StaticMutex::mutex);
             if (!m_i) {
                 static std::string_view module = "";
                 m_i = _ioc(iocContext())->template resolve<I>(module);