static-lib: do not force-uninitialize on atexit when context IsInScript

obastemur · obastemur · commit 4c2118a6f323 · 2017-01-28T13:37:13.000+01:00
diff --git a/lib/Jsrt/JsrtHelper.cpp b/lib/Jsrt/JsrtHelper.cpp
@@ -109,7 +109,12 @@ void JsrtCallbackState::ObjectBeforeCallectCallbackWrapper(JsObjectBeforeCollect
     // we do not track the main thread. When it exits do the cleanup below
 #ifdef CHAKRA_STATIC_LIBRARY
     atexit([]() {
-        ThreadBoundThreadContextManager::DestroyContextAndEntryForCurrentThread();
+        ThreadContext *threadContext = ThreadContext::GetContextForCurrentThread();
+        if (threadContext)
+        {
+            if (threadContext->IsInScript()) return;
+            ThreadBoundThreadContextManager::DestroyContextAndEntryForCurrentThread();
+        }
 
         JsrtRuntime::Uninitialize();
 
diff --git a/lib/Jsrt/JsrtRuntime.cpp b/lib/Jsrt/JsrtRuntime.cpp
@@ -53,6 +53,9 @@ void JsrtRuntime::Uninitialize()
     while (currentThreadContext)
     {
         Assert(!currentThreadContext->IsScriptActive());
+#ifdef CHAKRA_STATIC_LIBRARY
+        if (currentThreadContext->IsInScript()) break;
+#endif
         JsrtRuntime* currentRuntime = static_cast<JsrtRuntime*>(currentThreadContext->GetJSRTRuntime());
         tmpThreadContext = currentThreadContext;
         currentThreadContext = currentThreadContext->Next();
