Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[Loader] Don't initialize COM model stuff in winw

Browse Source
This commit is contained in:
momo5502 2017-05-29 23:44:34 +02:00
parent db2adce865
commit c21b3cd7a9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Components/Loader.cpp
View File

@ -30,7 +30,7 @@ namespace Components
Loader::MemAllocator.clear(); Loader::MemAllocator.clear();
Loader::ComInitialized = false; 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 Flags());
Loader::Register(new Singleton()); Loader::Register(new Singleton());
@ -120,7 +120,7 @@ namespace Components
Loader::Components.clear(); Loader::Components.clear();
Loader::MemAllocator.clear(); Loader::MemAllocator.clear();
if (!Loader::PerformingUnitTests() && Loader::ComInitialized) CoUninitialize(); if (!Loader::PerformingUnitTests() && !Utils::IsWineEnvironment() && Loader::ComInitialized) CoUninitialize();
} }
void Loader::PreDestroy() void Loader::PreDestroy()