diff options
| author | Richard Linden <none@none> | 2013-11-06 09:42:46 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-11-06 09:42:46 -0800 |
| commit | d9d46d908c0573dbcd45ec2a1bea56966823343b (patch) | |
| tree | 12c095a60fdbb9d7317f544ab3c72f55e9114f93 /indra/media_plugins | |
| parent | 2cb781705e56e31e11c4c37891b2ac86326aa411 (diff) | |
| parent | a10eb7b240675b009430f6718d410399d8045581 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/media_plugins')
| -rwxr-xr-x | indra/media_plugins/winmmshim/winmm_shim.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/media_plugins/winmmshim/winmm_shim.cpp b/indra/media_plugins/winmmshim/winmm_shim.cpp index aac349bf57..6297189869 100755 --- a/indra/media_plugins/winmmshim/winmm_shim.cpp +++ b/indra/media_plugins/winmmshim/winmm_shim.cpp @@ -39,7 +39,10 @@ BOOL APIENTRY DllMain( HMODULE hModule, LPVOID lpReserved ) { - InitializeCriticalSection(&sCriticalSection); + if (ul_reason_for_call == DLL_PROCESS_ATTACH) + { + InitializeCriticalSection(&sCriticalSection); + } return TRUE; } |