flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 20:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #478, fixes for datacache and containerbase discussed with MS via slack

Browse Source
This commit is contained in:
Klaus Basan
2015-10-14 02:21:22 +02:00
committed by Mathew Sutcliffe
parent 1b75f068be
commit 2d46a93676
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/datacache.cpp
View File

@@ -67,7 +67,7 @@ namespace BlackCore
{ {
QMutexLocker lock(&m_mutex); QMutexLocker lock(&m_mutex);
QLockFile revisionFileLock(m_revisionFileName); QLockFile revisionFileLock(m_revisionFileName + ".lock");
if (! revisionFileLock.lock()) if (! revisionFileLock.lock())
{ {
CLogMessage(this).error("Failed to lock %1: %2") << m_revisionFileName << lockFileError(revisionFileLock); CLogMessage(this).error("Failed to lock %1: %2") << m_revisionFileName << lockFileError(revisionFileLock);
@@ -93,7 +93,7 @@ namespace BlackCore
{ {
QMutexLocker lock(&m_mutex); QMutexLocker lock(&m_mutex);
QLockFile revisionFileLock(m_revisionFileName); QLockFile revisionFileLock(m_revisionFileName + ".lock");
if (revLock && ! revisionFileLock.lock()) if (revLock && ! revisionFileLock.lock())
{ {
CLogMessage(this).error("Failed to lock %1: %2") << m_revisionFileName << lockFileError(revisionFileLock); CLogMessage(this).error("Failed to lock %1: %2") << m_revisionFileName << lockFileError(revisionFileLock);

1
src/blackmisc/containerbase.h
View File

@@ -141,6 +141,7 @@ namespace BlackMisc
//! \copydoc CValueObject::convertFromJson //! \copydoc CValueObject::convertFromJson
void convertFromJson(const QJsonObject &json) void convertFromJson(const QJsonObject &json)
{ {
derived().clear();
QJsonArray array = json.value("containerbase").toArray(); QJsonArray array = json.value("containerbase").toArray();
for (auto i = array.begin(); i != array.end(); ++i) for (auto i = array.begin(); i != array.end(); ++i)
{ {