fixed unbalanced CoInitialize/CoUninitialize call

thestk · Sep 30, 2024 · 3e1669b · 3e1669b
1 parent af3b361
commit 3e1669b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/include/asiolist.cpp b/include/asiolist.cpp
@@ -193,14 +193,18 @@ AsioDriverList::AsioDriverList ()
 		pdl = pdl->next;
 	}
 
-	if (numdrv) CoInitialize(0);	// initialize COM
+	coInitialized_ = false;
+	if (numdrv)	{
+		HRESULT hr = CoInitialize(0);	// initialize COM
+		if( !FAILED( hr ) ) coInitialized_ = true;
+	}
 }
 
 AsioDriverList::~AsioDriverList ()
 {
 	if (numdrv) {
 		deleteDrvStruct(lpdrvlist);
-		CoUninitialize();
+		if( coInitialized_ ) CoUninitialize(); // balanced call.
 	}
 }
 

diff --git a/include/asiolist.h b/include/asiolist.h
@@ -39,6 +39,9 @@ class AsioDriverList {
 	// or use directly access
 	LPASIODRVSTRUCT	lpdrvlist;
 	int				numdrv;
+
+private:
+	bool coInitialized_;
 };
 
 typedef class AsioDriverList *LPASIODRIVERLIST;