Fix LocalDirectoryUpdater to take care if is Enabled in option.

This commit is contained in:
Phenom 2017-02-26 15:42:32 +01:00
parent 753ebdd52b
commit c3c2671db4
2 changed files with 20 additions and 16 deletions

View File

@ -70,24 +70,28 @@ void LocalDirectoryUpdater::setEnabled(bool b)
void LocalDirectoryUpdater::data_tick()
{
time_t now = time(NULL) ;
if(now > mDelayBetweenDirectoryUpdates + mLastSweepTime)
if (mIsEnabled)
{
if(sweepSharedDirectories())
{
mNeedsFullRecheck = false ;
mLastSweepTime = now;
mSharedDirectories->notifyTSChanged() ;
}
else
std::cerr << "(WW) sweepSharedDirectories() failed. Will do it again in a short time." << std::endl;
if(now > mDelayBetweenDirectoryUpdates + mLastSweepTime)
{
if(sweepSharedDirectories())
{
mNeedsFullRecheck = false;
mLastSweepTime = now ;
mSharedDirectories->notifyTSChanged();
}
else
std::cerr << "(WW) sweepSharedDirectories() failed. Will do it again in a short time." << std::endl;
}
if(now > DELAY_BETWEEN_LOCAL_DIRECTORIES_TS_UPDATE + mLastTSUpdateTime)
{
mSharedDirectories->updateTimeStamps() ;
mLastTSUpdateTime = now ;
}
}
if(now > DELAY_BETWEEN_LOCAL_DIRECTORIES_TS_UPDATE + mLastTSUpdateTime)
{
mSharedDirectories->updateTimeStamps() ;
mLastTSUpdateTime = now ;
}
usleep(10*1000*1000);
}

View File

@ -179,7 +179,7 @@ int p3FileDatabase::tick()
#endif
last_print_time = now ;
//#warning this should be removed, but it's necessary atm for updating the GUI
#warning mr-alice 2016-08-19: This should be removed, but it's necessary atm for updating the GUI
RsServer::notify()->notifyListChange(NOTIFY_LIST_DIRLIST_LOCAL, 0);
}