Merge pull request #9039 from shuffle2/bt-dll

windows: keep an extra reference to BluetoothApis.dll
This commit is contained in:
JMC47 2020-09-11 04:28:55 -04:00 committed by GitHub
commit 1335df8eb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -24,6 +24,7 @@
#include "Common/CommonFuncs.h" #include "Common/CommonFuncs.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/DynamicLibrary.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/ScopeGuard.h" #include "Common/ScopeGuard.h"
#include "Common/Thread.h" #include "Common/Thread.h"
@ -168,6 +169,7 @@ bool load_bthprops()
void init_lib() void init_lib()
{ {
static bool initialized = false; static bool initialized = false;
static Common::DynamicLibrary bt_api_lib;
if (!initialized) if (!initialized)
{ {
@ -182,6 +184,10 @@ void init_lib()
return; return;
} }
// Try to incref on this dll to prevent it being reloaded continuously (caused by
// BluetoothFindFirstRadio)
bt_api_lib.Open("BluetoothApis.dll");
s_loaded_ok = true; s_loaded_ok = true;
} }
} }