Skip to content

fix: improve SVG icon cache validation #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
18202781743 merged 1 commit into from
May 26, 2025
Merged

fix: improve SVG icon cache validation #268

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions iconengineplugins/svgiconengine/qsvgiconengine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@ QPixmap QSvgIconEngine::pixmap(const QSize &size, QIcon::Mode mode,

QString cacheFile;

if (Q_LIKELY(!svgFile.startsWith(":/") && QFile::exists(svgFile))) {
const QFileInfo svgFileInfo(svgFile);
// ostree管理的源文件 lastModified 被重置为1970-01-01，qt认为是无效时间，无法设置到缓存文件中
if (Q_LIKELY(!svgFile.startsWith(":/") && svgFileInfo.exists() && svgFileInfo.lastModified().isValid())) {
static const QString &cachePath = getIconCachePath();

if (Q_LIKELY(!cachePath.isEmpty())) {
Expand All @@ -192,8 +194,6 @@ QPixmap QSvgIconEngine::pixmap(const QSize &size, QIcon::Mode mode,

const QFileInfo cacheFileInfo(cacheFile);
if (Q_LIKELY(cacheFileInfo.exists())) {
const QFileInfo svgFileInfo(svgFile);

if (Q_UNLIKELY(svgFileInfo.lastModified() != cacheFileInfo.lastModified())) {
// clear invalid cache file
QFile::remove(cacheFile);
Expand Down