From 8031f33b5347c95148f9f2ce57c25d4cf464da51 Mon Sep 17 00:00:00 2001 From: nerix Date: Mon, 14 Nov 2022 14:32:51 +0100 Subject: [PATCH] fix: Mark Bad or Invalid Images as Empty (#4151) --- CHANGELOG.md | 1 + src/messages/Image.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6964b49fe..7e70b6f81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -116,6 +116,7 @@ - Bugfix: Fixed channel-based popups from rewriting messages to file log (#4060) - Bugfix: Fixed invalid/dangling completion when cycling through previous messages or replying (#4072) - Bugfix: Fixed incorrect .desktop icon path. (#4078) +- Bugfix: Mark bad or invalid images as empty. (#4151) - Dev: Got rid of BaseTheme (#4132) - Dev: Removed official support for QMake. (#3839, #3883) - Dev: Rewrote LimitedQueue (#3798) diff --git a/src/messages/Image.cpp b/src/messages/Image.cpp index 6f5171a24..13d2ebf03 100644 --- a/src/messages/Image.cpp +++ b/src/messages/Image.cpp @@ -479,12 +479,14 @@ void Image::actuallyLoad() { qCDebug(chatterinoImage) << "Error: image cant be read " << shared->url().string; + shared->empty_ = true; return Failure; } const auto size = reader.size(); if (size.isEmpty()) { + shared->empty_ = true; return Failure; } @@ -494,6 +496,7 @@ void Image::actuallyLoad() qCDebug(chatterinoImage) << "Error: image has less than 1 frame " << shared->url().string << ": " << reader.errorString(); + shared->empty_ = true; return Failure; } @@ -504,6 +507,7 @@ void Image::actuallyLoad() { qCDebug(chatterinoImage) << "image too large in RAM"; + shared->empty_ = true; return Failure; }