Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 +1 -1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c298917b85 - Show all commits

2
src/crypto/aes.cpp
View file

@ -429,7 +429,7 @@ openssl_thread_config::openssl_thread_config()
} }
openssl_thread_config::~openssl_thread_config() openssl_thread_config::~openssl_thread_config()
{ {
if (CRYPTO_get_id_callback() != NULL && CRYPTO_get_id_callback() == &get_thread_id) if (CRYPTO_get_id_callback() == &get_thread_id)
{ {
CRYPTO_set_id_callback(NULL); CRYPTO_set_id_callback(NULL);
CRYPTO_set_locking_callback(NULL); CRYPTO_set_locking_callback(NULL);