fix: Benchmarks segfaulting/asserting on missing emotes (#5146)
This was caused by https://github.com/Chatterino/chatterino2/commit/5628605de456a7587fe6add6beff49a5f71c9f8c
This commit is contained in:
+1
-1
@@ -114,7 +114,7 @@
|
|||||||
- Dev: Refactored the Image Uploader feature. (#4971)
|
- Dev: Refactored the Image Uploader feature. (#4971)
|
||||||
- Dev: Refactored the SplitOverlay code. (#5082)
|
- Dev: Refactored the SplitOverlay code. (#5082)
|
||||||
- Dev: Refactored the TwitchBadges structure, making it less of a singleton. (#5096, #5144)
|
- Dev: Refactored the TwitchBadges structure, making it less of a singleton. (#5096, #5144)
|
||||||
- Dev: Refactored emotes out of TwitchIrcServer. (#5120)
|
- Dev: Refactored emotes out of TwitchIrcServer. (#5120, #5146)
|
||||||
- Dev: Refactored the ChatterinoBadges structure, making it less of a singleton. (#5103)
|
- Dev: Refactored the ChatterinoBadges structure, making it less of a singleton. (#5103)
|
||||||
- Dev: Refactored the ColorProvider class a bit. (#5112)
|
- Dev: Refactored the ColorProvider class a bit. (#5112)
|
||||||
- Dev: Moved the Network files to their own folder. (#5089)
|
- Dev: Moved the Network files to their own folder. (#5089)
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
#include "providers/recentmessages/Impl.hpp"
|
#include "providers/recentmessages/Impl.hpp"
|
||||||
#include "providers/seventv/SeventvBadges.hpp"
|
#include "providers/seventv/SeventvBadges.hpp"
|
||||||
#include "providers/seventv/SeventvEmotes.hpp"
|
#include "providers/seventv/SeventvEmotes.hpp"
|
||||||
|
#include "providers/twitch/TwitchBadges.hpp"
|
||||||
#include "providers/twitch/TwitchChannel.hpp"
|
#include "providers/twitch/TwitchChannel.hpp"
|
||||||
#include "singletons/Emotes.hpp"
|
#include "singletons/Emotes.hpp"
|
||||||
#include "singletons/Resources.hpp"
|
#include "singletons/Resources.hpp"
|
||||||
@@ -72,6 +73,26 @@ public:
|
|||||||
return &this->highlights;
|
return &this->highlights;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TwitchBadges *getTwitchBadges() override
|
||||||
|
{
|
||||||
|
return &this->twitchBadges;
|
||||||
|
}
|
||||||
|
|
||||||
|
BttvEmotes *getBttvEmotes() override
|
||||||
|
{
|
||||||
|
return &this->bttvEmotes;
|
||||||
|
}
|
||||||
|
|
||||||
|
FfzEmotes *getFfzEmotes() override
|
||||||
|
{
|
||||||
|
return &this->ffzEmotes;
|
||||||
|
}
|
||||||
|
|
||||||
|
SeventvEmotes *getSeventvEmotes() override
|
||||||
|
{
|
||||||
|
return &this->seventvEmotes;
|
||||||
|
}
|
||||||
|
|
||||||
AccountController accounts;
|
AccountController accounts;
|
||||||
Emotes emotes;
|
Emotes emotes;
|
||||||
mock::UserDataController userData;
|
mock::UserDataController userData;
|
||||||
@@ -80,6 +101,10 @@ public:
|
|||||||
FfzBadges ffzBadges;
|
FfzBadges ffzBadges;
|
||||||
SeventvBadges seventvBadges;
|
SeventvBadges seventvBadges;
|
||||||
HighlightController highlights;
|
HighlightController highlights;
|
||||||
|
TwitchBadges twitchBadges;
|
||||||
|
BttvEmotes bttvEmotes;
|
||||||
|
FfzEmotes ffzEmotes;
|
||||||
|
SeventvEmotes seventvEmotes;
|
||||||
};
|
};
|
||||||
|
|
||||||
std::optional<QJsonDocument> tryReadJsonFile(const QString &path)
|
std::optional<QJsonDocument> tryReadJsonFile(const QString &path)
|
||||||
|
|||||||
Reference in New Issue
Block a user