diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-11-22 01:01:12 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-11-22 02:31:12 +0200 |
| commit | d3da20d63f6ddf6f3760208d7db130d15860e852 (patch) | |
| tree | cad36b0b2730d0864d49ee265f980f2906cdd707 /indra/newview/llmachineid.cpp | |
| parent | bfcc7a92b3c5f62c79879b8234c7055a3a83d9a5 (diff) | |
SL-20603 Crash on CoInitialize
Don't mix CoInitialize and CoInitializeEx, one is global, other is
threaded.
CoInitialize(0) is equal to CoInitializeEx(0, COINIT_APARTMENTTHREADED)
and MULTITHREADED is not compatible with APARTMENTTHREADED.
Diffstat (limited to 'indra/newview/llmachineid.cpp')
| -rw-r--r-- | indra/newview/llmachineid.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llmachineid.cpp b/indra/newview/llmachineid.cpp index 583742f970..8f03b13d2d 100644 --- a/indra/newview/llmachineid.cpp +++ b/indra/newview/llmachineid.cpp @@ -88,6 +88,7 @@ void LLWMIMethods::initCOMObjects() mHR = CoInitializeEx(0, COINIT_MULTITHREADED); if (FAILED(mHR)) { + // if result S_FALSE, it's already initialized LL_DEBUGS("AppInit") << "Failed to initialize COM library. Error code = 0x" << std::hex << mHR << LL_ENDL; return; } |