From a72a11db8e36ea59122d215aaa164dd2f14c9037 Mon Sep 17 00:00:00 2001 From: Leonardo de Moura Date: Wed, 17 Sep 2014 08:39:06 -0700 Subject: [PATCH] fix(util/script_state_manager): crash when compiling with msys2 stack Signed-off-by: Leonardo de Moura --- src/util/thread_script_state.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/thread_script_state.cpp b/src/util/thread_script_state.cpp index 9e202e3a88..c2bf6ab19d 100644 --- a/src/util/thread_script_state.cpp +++ b/src/util/thread_script_state.cpp @@ -22,8 +22,10 @@ struct script_state_manager { }; static script_state_manager & get_manager() { - static script_state_manager g_manager; - return g_manager; + static std::unique_ptr g_manager; + if (!g_manager.get()) + g_manager.reset(new script_state_manager()); + return *g_manager; } static script_state_manager & g_aux = get_manager(); // force manager to be initialized at startup