summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Woyak <jordan.woyak@gmail.com>2026-04-17 12:25:54 -0500
committerGitHub <noreply@github.com>2026-04-17 12:25:54 -0500
commitcc5601d7db08e63414835fb2c8d530df2f3491da (patch)
tree883fc819f9f2df0136761e6923064b3b895360f1
parent6d43b55b27ab303287de56fbd5f0eb5685ec4529 (diff)
parent46866f6fa2c39cef03b93ab6dbf2525b63c2bf08 (diff)
Merge pull request #14588 from jordan-woyak/resources-icon-assert
DolphinQt/Resources: ERROR_LOG instead of ASSERT when LoadNamedIcon fails.
-rw-r--r--Source/Core/DolphinQt/Resources.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/DolphinQt/Resources.cpp b/Source/Core/DolphinQt/Resources.cpp
index b32d7ac7ac..89f0c0a46c 100644
--- a/Source/Core/DolphinQt/Resources.cpp
+++ b/Source/Core/DolphinQt/Resources.cpp
@@ -8,8 +8,8 @@
#include <QImageReader>
#include <QPixmap>
-#include "Common/Assert.h"
#include "Common/FileUtil.h"
+#include "Common/Logging/Log.h"
#include "Core/Config/MainSettings.h"
@@ -48,7 +48,10 @@ QIcon Resources::LoadNamedIcon(std::string_view name, const QString& dir)
for (auto scale : {1, 2, 4})
load_png(scale);
- ASSERT(icon.availableSizes().size() > 0);
+ if (icon.isNull())
+ {
+ ERROR_LOG_FMT(COMMON, "LoadNamedIcon: \"{}\" could not be loaded.", name);
+ }
return icon;
}