Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-22 07:41:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

generally prevent threads to start twice, and fixed bug causing DirWatcher to be run twice

Browse source
This commit is contained in:
cyril soler 2016-11-07 10:09:28 +01:00
parent eb95c6895a
commit 461975f115
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libretroshare/src/file_sharing/directory_updater.cc
View file

@ -54,10 +54,10 @@ void LocalDirectoryUpdater::setEnabled(bool b)
if(mIsEnabled == b) if(mIsEnabled == b)
return ; return ;
if(b) if(!b)
start("fs dir updater") ;
else
shutdown(); shutdown();
else if(!isRunning())
start("fs dir updater") ;
mIsEnabled = b ; mIsEnabled = b ;
} }

5
libretroshare/src/util/rsthreads.cc
View file

@ -157,6 +157,11 @@ void RsTickingThread::fullstop()
void RsThread::start(const std::string &threadName) void RsThread::start(const std::string &threadName)
{ {
if(isRunning())
{
std::cerr << "(EE) RsThread \"" << threadName << "\" is already running. Will not start twice!" << std::endl;
return ;
}
pthread_t tid; pthread_t tid;
void *data = (void *)this ; void *data = (void *)this ;