[Loader] Don't initialize COM model stuff in winw
This commit is contained in:
parent
db2adce865
commit
c21b3cd7a9
@ -30,7 +30,7 @@ namespace Components
|
||||
Loader::MemAllocator.clear();
|
||||
|
||||
Loader::ComInitialized = false;
|
||||
if (!Loader::PerformingUnitTests()) Loader::ComInitialized = (CoInitialize(nullptr) == S_OK);
|
||||
if (!Loader::PerformingUnitTests() && !Utils::IsWineEnvironment()) Loader::ComInitialized = (CoInitialize(nullptr) == S_OK);
|
||||
|
||||
Loader::Register(new Flags());
|
||||
Loader::Register(new Singleton());
|
||||
@ -120,7 +120,7 @@ namespace Components
|
||||
Loader::Components.clear();
|
||||
Loader::MemAllocator.clear();
|
||||
|
||||
if (!Loader::PerformingUnitTests() && Loader::ComInitialized) CoUninitialize();
|
||||
if (!Loader::PerformingUnitTests() && !Utils::IsWineEnvironment() && Loader::ComInitialized) CoUninitialize();
|
||||
}
|
||||
|
||||
void Loader::PreDestroy()
|
||||
|
Loading…
Reference in New Issue
Block a user