noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: Mark Bad or Invalid Images as Empty (#4151)

Browse source
This commit is contained in:
nerix 2022-11-14 14:32:51 +01:00 committed by GitHub
parent 9fbdb936ab
commit 8031f33b53
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -116,6 +116,7 @@
- Bugfix: Fixed channel-based popups from rewriting messages to file log (#4060) - 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 invalid/dangling completion when cycling through previous messages or replying (#4072)
- Bugfix: Fixed incorrect .desktop icon path. (#4078) - Bugfix: Fixed incorrect .desktop icon path. (#4078)
- Bugfix: Mark bad or invalid images as empty. (#4151)
- Dev: Got rid of BaseTheme (#4132) - Dev: Got rid of BaseTheme (#4132)
- Dev: Removed official support for QMake. (#3839, #3883) - Dev: Removed official support for QMake. (#3839, #3883)
- Dev: Rewrote LimitedQueue (#3798) - Dev: Rewrote LimitedQueue (#3798)

4
src/messages/Image.cpp
View file

@ -479,12 +479,14 @@ void Image::actuallyLoad()
{ {
qCDebug(chatterinoImage) qCDebug(chatterinoImage)
<< "Error: image cant be read " << shared->url().string; << "Error: image cant be read " << shared->url().string;
shared->empty_ = true;
return Failure; return Failure;
} }
const auto size = reader.size(); const auto size = reader.size();
if (size.isEmpty()) if (size.isEmpty())
{ {
shared->empty_ = true;
return Failure; return Failure;
} }
@ -494,6 +496,7 @@ void Image::actuallyLoad()
qCDebug(chatterinoImage) qCDebug(chatterinoImage)
<< "Error: image has less than 1 frame " << "Error: image has less than 1 frame "
<< shared->url().string << ": " << reader.errorString(); << shared->url().string << ": " << reader.errorString();
shared->empty_ = true;
return Failure; return Failure;
} }
@ -504,6 +507,7 @@ void Image::actuallyLoad()
{ {
qCDebug(chatterinoImage) << "image too large in RAM"; qCDebug(chatterinoImage) << "image too large in RAM";
shared->empty_ = true;
return Failure; return Failure;
} }