hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source 
# Conflicts:
#	lib/stream.cpp
This commit is contained in:
Thulinma 2016-09-21 12:38:51 +02:00
commit 9060d7b618
2 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/tinythread.cpp
View file

@ -169,8 +169,10 @@ namespace tthread {
// The thread is no longer executing
if (ti->mThread) {
lock_guard<mutex> guard(ti->mThread->mDataMutex);
ti->mThread->mNotAThread = true;
ti->mThread->ti_copy = 0;
if (ti->mThread){
ti->mThread->mNotAThread = true;
ti->mThread->ti_copy = 0;
}
}
// The thread is responsible for freeing the startup information