projects
/
nextcloud-desktop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4db90b0
)
Prevent crash when originalSize is null
author
Claudio Cambra
<claudio.cambra@nextcloud.com>
Thu, 6 Jun 2024 14:36:02 +0000
(22:36 +0800)
committer
Claudio Cambra
<claudio.cambra@nextcloud.com>
Thu, 6 Jun 2024 16:17:40 +0000
(
00:17
+0800)
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
src/gui/iconutils.cpp
patch
|
blob
|
history
diff --git
a/src/gui/iconutils.cpp
b/src/gui/iconutils.cpp
index ba9204e039261a2e93416b476c95241c476b7793..22ce38f85aabb73e1311228a94924563063e9648 100644
(file)
--- a/
src/gui/iconutils.cpp
+++ b/
src/gui/iconutils.cpp
@@
-108,7
+108,7
@@
QImage createSvgImageWithCustomColor(const QString &fileName,
return {};
}
- const auto sizeToUse = requestedSize.isValid() ? requestedSize : *originalSize;
+ const auto sizeToUse = requestedSize.isValid()
|| originalSize == nullptr
? requestedSize : *originalSize;
// some icons are present in white or black only, so, we need to check both when needed
const auto iconBaseColors = QStringList{QStringLiteral("black"), QStringLiteral("white")};