chatterino2
Code Issues

Fix FFZ emote assertion crash (#2192)

Browse Source 
* Fix crash on null urls from FFZ API

* Update CHANGELOG.md

* Turns out there's an actual method for this
This commit is contained in:
Daniel
2020-11-17 04:27:14 -05:00
committed by GitHub
parent cc42e6f6ba
commit b572c187a4
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -47,6 +47,7 @@
- Bugfix: Fix bug preventing moderator actions when viewing a user card from the search window (#1089) - Bugfix: Fix bug preventing moderator actions when viewing a user card from the search window (#1089)
- Bugfix: Fix `:` emote completion menu ignoring emote capitalization (#1962) - Bugfix: Fix `:` emote completion menu ignoring emote capitalization (#1962)
- Bugfix: Fix a bug that caused `Ignore page` to fall into an infinity loop with an empty pattern and regex enabled (#2125) - Bugfix: Fix a bug that caused `Ignore page` to fall into an infinity loop with an empty pattern and regex enabled (#2125)
- Bugfix: Fix a crash casued by FrankerFaceZ responding with invalid emote links (#2191)
## 2.2.0 ## 2.2.0
src/providers/ffz/FfzEmotes.cpp
+1 -1
View File
@@ -14,7 +14,7 @@ namespace {
Url getEmoteLink(const QJsonObject &urls, const QString &emoteScale) Url getEmoteLink(const QJsonObject &urls, const QString &emoteScale)
{ {
auto emote = urls.value(emoteScale); auto emote = urls.value(emoteScale);
if (emote.isUndefined()) if (emote.isUndefined() || emote.isNull())
{ {
return {""}; return {""};
} }