diff --git a/src/Components/Loader.cpp b/src/Components/Loader.cpp index 7a5025a1..066749f7 100644 --- a/src/Components/Loader.cpp +++ b/src/Components/Loader.cpp @@ -23,7 +23,7 @@ namespace Components Loader::Postgame = false; Loader::MemAllocator.clear(); - CoInitialize(nullptr); + if(!Loader::PerformingUnitTests()) CoInitialize(nullptr); Loader::Register(new Flags()); Loader::Register(new Singleton()); @@ -117,7 +117,7 @@ namespace Components Loader::Components.clear(); Loader::MemAllocator.clear(); - CoUninitialize(); + if (!Loader::PerformingUnitTests()) CoUninitialize(); } void Loader::PreDestroy()