Prevent crash when originalSize is null

Signed-off-by: Claudio Cambra <[email protected]>
nextcloud · Jul 19, 2024 · 28f5c78 · 28f5c78
1 parent 03c574c
commit 28f5c78
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/gui/iconutils.cpp b/src/gui/iconutils.cpp
@@ -108,9 +108,11 @@ QImage createSvgImageWithCustomColor(const QString &fileName,
         return {};
     }
 
+    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")};
-    const auto customColorImage = findImageWithCustomColor(fileName, customColor, iconBaseColors, requestedSize);
+    const auto customColorImage = findImageWithCustomColor(fileName, customColor, iconBaseColors, sizeToUse);
 
     if (!customColorImage.isNull()) {
         return customColorImage;
@@ -125,7 +127,7 @@ QImage createSvgImageWithCustomColor(const QString &fileName,
         return {};
     }
 
-    const auto result = drawSvgWithCustomFillColor(sourceSvg, customColor, originalSize, requestedSize);
+    const auto result = drawSvgWithCustomFillColor(sourceSvg, customColor, originalSize, sizeToUse);
     Q_ASSERT(!result.isNull());
 
     if (result.isNull()) {