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 +5 -2
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 95ca36d02d - Show all commits

7
src/thread/thread.cpp
View file

@ -77,6 +77,7 @@ namespace fc {
try { try {
set_thread_name(name.c_str()); // set thread's name for the debugger to display set_thread_name(name.c_str()); // set thread's name for the debugger to display
this->my = new thread_d( *this, notifier ); this->my = new thread_d( *this, notifier );
cleanup();
current_thread() = this; current_thread() = this;
p->set_value(); p->set_value();
exec(); exec();
@ -126,8 +127,10 @@ namespace fc {
} }
void thread::cleanup() { void thread::cleanup() {
delete current_thread(); if ( current_thread() ) {
current_thread() = nullptr; delete current_thread();
current_thread() = nullptr;
}
} }
const string& thread::name()const const string& thread::name()const