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

Check thread for icon cache (assert)

Browse Source
This commit is contained in:
Klaus Basan
2017-07-01 17:15:43 +02:00
committed by Mathew Sutcliffe
parent 9ad721b77a
commit 709b9a3dd9
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackmisc/icons.cpp
View File

@@ -12,6 +12,7 @@
#include "blackconfig/buildconfig.h" #include "blackconfig/buildconfig.h"
#include "blackmisc/fileutils.h" #include "blackmisc/fileutils.h"
#include "blackmisc/icons.h" #include "blackmisc/icons.h"
#include "blackmisc/threadutils.h"
#include <QIcon> #include <QIcon>
#include <QImage> #include <QImage>
@@ -1143,20 +1144,16 @@ namespace BlackMisc
const QPixmap &CIcons::pixmapByResourceFileName(const QString &fileName) const QPixmap &CIcons::pixmapByResourceFileName(const QString &fileName)
{ {
//! \fixme KB 20170701 noticed the "cache" is not threadsafe. However, there has never be an issue so far. Added thread assert.
Q_ASSERT_X(!fileName.isEmpty(), Q_FUNC_INFO, "missing filename"); Q_ASSERT_X(!fileName.isEmpty(), Q_FUNC_INFO, "missing filename");
Q_ASSERT_X(CThreadUtils::isCurrentThreadApplicationThread(), Q_FUNC_INFO, "not thread safe");
if (!getResourceFileCache().contains(fileName)) if (!getResourceFileCache().contains(fileName))
{ {
const QString path = CFileUtils::appendFilePaths(CBuildConfig::getImagesDir(), fileName); const QString path = CFileUtils::appendFilePaths(CBuildConfig::getImagesDir(), fileName);
QPixmap pm; QPixmap pm;
const bool s = pm.load(path); const bool s = pm.load(path);
if (s) getResourceFileCache().insert(fileName, s ? pm : CIcons::empty());
{
getResourceFileCache().insert(fileName, pm);
}
else
{
getResourceFileCache().insert(fileName, CIcons::empty());
}
} }
return getResourceFileCache()[fileName]; return getResourceFileCache()[fileName];
} }

2
src/blackmisc/icons.h
View File

@@ -703,7 +703,7 @@ namespace BlackMisc
static QPixmap rotate(int rotateDegrees, const QPixmap &original); static QPixmap rotate(int rotateDegrees, const QPixmap &original);
private: private:
//! File cache for the loaded //! File cache for the loaded files
static QMap<QString, QPixmap> &getResourceFileCache(); static QMap<QString, QPixmap> &getResourceFileCache();
}; };
} }