Fix uninitializing crashes.

m1maker · Nov 12, 2024 · 9f3e695 · 9f3e695
1 parent 9d18302
commit 9f3e695
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/SRC/SRAL.cpp b/SRC/SRAL.cpp
@@ -258,8 +258,10 @@ extern "C" SRAL_API bool SRAL_Initialize(int engines_exclude) {
 }
 extern "C" SRAL_API void SRAL_Uninitialize(void) {
 	if (!g_initialized)return;
-	g_currentEngine->Uninitialize();
-	delete g_currentEngine;
+	for (uint64_t i = 0; i < g_engines.size(); ++i) {
+		g_engines[i]->Uninitialize();
+		delete g_engines[i];
+	}
 	g_currentEngine = nullptr;
 	g_engines.clear();
 	g_excludes = 0;

diff --git a/SRC/UIA.cpp b/SRC/UIA.cpp
@@ -21,14 +21,15 @@ bool UIA::Initialize() {
 }
 
 bool UIA::Uninitialize() {
-	pProvider->Release();
+	if (pProvider)pProvider->Release();
 
-	pCondition->Release();
+	if (pCondition)pCondition->Release();
 
-	pAutomation->Release();
+	if (pAutomation)pAutomation->Release();
 
 	return true;
 }
+
 bool UIA::Speak(const char* text, bool interrupt) {
 	NotificationProcessing flags = NotificationProcessing_ImportantAll;
 	if (interrupt)