Added dataToMergeList into checks for active subgraphs.
This commit is contained in:
@@ -43,6 +43,24 @@ void DatabasePager::requestNodeFile(const std::string& fileName,osg::Group* grou
|
||||
|
||||
_dataToCompileListMutex.unlock();
|
||||
|
||||
if (!foundEntry)
|
||||
{
|
||||
_dataToMergeListMutex.lock();
|
||||
|
||||
for(DatabaseRequestList::iterator litr = _dataToMergeList.begin();
|
||||
litr != _dataToMergeList.end() && !foundEntry;
|
||||
++litr)
|
||||
{
|
||||
if ((*litr)->_fileName==fileName)
|
||||
{
|
||||
foundEntry = true;
|
||||
++((*litr)->_numOfRequests);
|
||||
}
|
||||
}
|
||||
|
||||
_dataToMergeListMutex.unlock();
|
||||
}
|
||||
|
||||
if (!foundEntry)
|
||||
{
|
||||
|
||||
|
||||
Reference in New Issue
Block a user