mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
fix: correctly load twitch badges in highlights page (#5223)
This commit is contained in:
parent
c1fa51242f
commit
3928cc9578
|
@ -59,6 +59,7 @@
|
||||||
- Bugfix: Fixed issue on Windows preventing the title bar from being dragged in the top left corner. (#4873)
|
- Bugfix: Fixed issue on Windows preventing the title bar from being dragged in the top left corner. (#4873)
|
||||||
- Bugfix: Fixed an issue where reply context didn't render correctly if an emoji was touching text. (#4875, #4977, #5174)
|
- Bugfix: Fixed an issue where reply context didn't render correctly if an emoji was touching text. (#4875, #4977, #5174)
|
||||||
- Bugfix: Fixed the input completion popup from disappearing when clicking on it on Windows and macOS. (#4876)
|
- Bugfix: Fixed the input completion popup from disappearing when clicking on it on Windows and macOS. (#4876)
|
||||||
|
- Bugfix: Fixed Twitch badges not loading correctly in the badge highlighting setting page. (#5223)
|
||||||
- Bugfix: Fixed double-click text selection moving its position with each new message. (#4898)
|
- Bugfix: Fixed double-click text selection moving its position with each new message. (#4898)
|
||||||
- Bugfix: Fixed an issue where notifications on Windows would contain no or an old avatar. (#4899)
|
- Bugfix: Fixed an issue where notifications on Windows would contain no or an old avatar. (#4899)
|
||||||
- Bugfix: Fixed headers of tables in the settings switching to bold text when selected. (#4913)
|
- Bugfix: Fixed headers of tables in the settings switching to bold text when selected. (#4913)
|
||||||
|
|
|
@ -242,10 +242,11 @@ void TwitchBadges::getBadgeIcons(const QList<DisplayBadge> &badges,
|
||||||
void TwitchBadges::loadEmoteImage(const QString &name, ImagePtr image,
|
void TwitchBadges::loadEmoteImage(const QString &name, ImagePtr image,
|
||||||
BadgeIconCallback &&callback)
|
BadgeIconCallback &&callback)
|
||||||
{
|
{
|
||||||
NetworkRequest(image->url().string)
|
auto url = image->url().string;
|
||||||
|
NetworkRequest(url)
|
||||||
.concurrent()
|
.concurrent()
|
||||||
.cache()
|
.cache()
|
||||||
.onSuccess([this, name, callback](auto result) {
|
.onSuccess([this, name, callback, url](auto result) {
|
||||||
auto data = result.getData();
|
auto data = result.getData();
|
||||||
|
|
||||||
// const cast since we are only reading from it
|
// const cast since we are only reading from it
|
||||||
|
@ -255,17 +256,18 @@ void TwitchBadges::loadEmoteImage(const QString &name, ImagePtr image,
|
||||||
|
|
||||||
if (!reader.canRead() || reader.size().isEmpty())
|
if (!reader.canRead() || reader.size().isEmpty())
|
||||||
{
|
{
|
||||||
|
qCWarning(chatterinoTwitch)
|
||||||
|
<< "Can't read badge image at" << url << "for" << name
|
||||||
|
<< reader.errorString();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
QImage image = reader.read();
|
QImage image = reader.read();
|
||||||
if (image.isNull())
|
if (image.isNull())
|
||||||
{
|
{
|
||||||
return;
|
qCWarning(chatterinoTwitch)
|
||||||
}
|
<< "Failed reading badge image at" << url << "for" << name
|
||||||
|
<< reader.errorString();
|
||||||
if (reader.imageCount() <= 0)
|
|
||||||
{
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue