fly/flightgear
1
0
Fork 0
Code Activity

NavCache: avoid spurious message on rebuild

Browse source
This commit is contained in:
James Turner 2021-05-26 10:22:59 +01:00
parent 34b8fbc58e
commit 180ad8d2d8
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Navaids/NavDataCache.cxx Normal file → Executable file
View file

@ -290,10 +290,6 @@ public:
throw sg_exception("Nav-cache file is not writeable"); throw sg_exception("Nav-cache file is not writeable");
} }
if (outer->isAnotherProcessRebuilding()) {
SG_LOG(SG_NAVCACHE, SG_ALERT, "NavDataCache: init() while another processing is rebuilding the DB");
}
int openFlags = readOnly ? SQLITE_OPEN_READONLY : int openFlags = readOnly ? SQLITE_OPEN_READONLY :
(SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE); (SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE);
std::string pathUtf8 = path.utf8Str(); std::string pathUtf8 = path.utf8Str();
@ -1524,6 +1520,7 @@ bool NavDataCache::isAnotherProcessRebuilding()
// (there could be multiple read-only copies in this situation) // (there could be multiple read-only copies in this situation)
ReleaseMutex(static_fgNavCacheRebuildMutex); ReleaseMutex(static_fgNavCacheRebuildMutex);
CloseHandle(static_fgNavCacheRebuildMutex); CloseHandle(static_fgNavCacheRebuildMutex);
static_fgNavCacheRebuildMutex = nullptr;
return false; return false;
} }