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: disable autoInvoke for emote settings (#3990)

Browse source 
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
This commit is contained in:
nerix 2022-09-14 13:21:01 +02:00 committed by GitHub
parent 6a2c4fc098
commit c6ebb70e05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -29,7 +29,7 @@
- Minor: Warn when parsing an environment variable fails. (#3904) - Minor: Warn when parsing an environment variable fails. (#3904)
- Minor: Load missing messages from Recent Messages API upon reconnecting (#3878, #3932) - Minor: Load missing messages from Recent Messages API upon reconnecting (#3878, #3932)
- Minor: Reduced image memory usage when running Chatterino for a long time. (#3915) - Minor: Reduced image memory usage when running Chatterino for a long time. (#3915)
- Minor: Add settings to toggle BTTV/FFZ global/channel emotes (#3935) - Minor: Add settings to toggle BTTV/FFZ global/channel emotes (#3935, #3990)
- Minor: Add AutoMod message flag filter. (#3938) - Minor: Add AutoMod message flag filter. (#3938)
- Minor: Added whitespace trim to username field in nicknames (#3946) - Minor: Added whitespace trim to username field in nicknames (#3946)
- Minor: Added `Go to message` context menu action to search popup, mentions, usercard and reply threads. (#3953) - Minor: Added `Go to message` context menu action to search popup, mentions, usercard and reply threads. (#3953)

32
src/Application.cpp
View file

@ -179,18 +179,26 @@ int Application::run(QApplication &qtApp)
this->windows->forceLayoutChannelViews(); this->windows->forceLayoutChannelViews();
}); });
getSettings()->enableBTTVGlobalEmotes.connect([this] { getSettings()->enableBTTVGlobalEmotes.connect(
this->twitch->reloadBTTVGlobalEmotes(); [this] {
}); this->twitch->reloadBTTVGlobalEmotes();
getSettings()->enableBTTVChannelEmotes.connect([this] { },
this->twitch->reloadAllBTTVChannelEmotes(); false);
}); getSettings()->enableBTTVChannelEmotes.connect(
getSettings()->enableFFZGlobalEmotes.connect([this] { [this] {
this->twitch->reloadFFZGlobalEmotes(); this->twitch->reloadAllBTTVChannelEmotes();
}); },
getSettings()->enableFFZChannelEmotes.connect([this] { false);
this->twitch->reloadAllFFZChannelEmotes(); getSettings()->enableFFZGlobalEmotes.connect(
}); [this] {
this->twitch->reloadFFZGlobalEmotes();
},
false);
getSettings()->enableFFZChannelEmotes.connect(
[this] {
this->twitch->reloadAllFFZChannelEmotes();
},
false);
return qtApp.exec(); return qtApp.exec();
} }