diff options
Diffstat (limited to 'src/Bindings/PluginLua.cpp')
| -rw-r--r-- | src/Bindings/PluginLua.cpp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/Bindings/PluginLua.cpp b/src/Bindings/PluginLua.cpp index d133c091a..0a2a8411d 100644 --- a/src/Bindings/PluginLua.cpp +++ b/src/Bindings/PluginLua.cpp @@ -63,12 +63,17 @@ void cPluginLua::Close(void) return; } - // Notify and remove all m_Resettables: - for (auto resettable: m_Resettables) + // Notify and remove all m_Resettables (unlock the m_CriticalSection while resetting them): + cResettablePtrs resettables; + std::swap(m_Resettables, resettables); { - resettable->Reset(); - } - m_Resettables.clear(); + cCSUnlock Unlock(Lock); + for (auto resettable: resettables) + { + resettable->Reset(); + } + m_Resettables.clear(); + } // cCSUnlock (m_CriticalSection) // Release all the references in the hook map: for (cHookMap::iterator itrH = m_HookMap.begin(), endH = m_HookMap.end(); itrH != endH; ++itrH) @@ -1853,8 +1858,7 @@ void cPluginLua::CallbackWindowSlotChanged(int a_FnRef, cWindow & a_Window, int // cPluginLua::cResettable: cPluginLua::cResettable::cResettable(cPluginLua & a_Plugin): - m_Plugin(&a_Plugin), - m_CSPlugin(a_Plugin.m_CriticalSection) + m_Plugin(&a_Plugin) { } |