Re-ordered the creating of the DatagbaseThread to avoid startThread being called twice.
This commit is contained in:
parent
862c36a08b
commit
a399e9ccb2
@ -1542,8 +1542,6 @@ void DatabasePager::requestNodeFile(const std::string& fileName, osg::NodePath&
|
||||
|
||||
if (!_startThreadCalled)
|
||||
{
|
||||
_startThreadCalled = true;
|
||||
_done = false;
|
||||
OSG_INFO<<"DatabasePager::startThread()"<<std::endl;
|
||||
|
||||
if (_databaseThreads.empty())
|
||||
@ -1553,6 +1551,9 @@ void DatabasePager::requestNodeFile(const std::string& fileName, osg::NodePath&
|
||||
osg::DisplaySettings::instance()->getNumOfHttpDatabaseThreadsHint());
|
||||
}
|
||||
|
||||
_startThreadCalled = true;
|
||||
_done = false;
|
||||
|
||||
for(DatabaseThreadList::const_iterator dt_itr = _databaseThreads.begin();
|
||||
dt_itr != _databaseThreads.end();
|
||||
++dt_itr)
|
||||
|
Loading…
Reference in New Issue
Block a user