noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

update settings version

Browse source
This commit is contained in:
Rasmus Karlsson 2017-06-17 15:15:58 +02:00
parent 8e0bc16710
commit 1d8795ef1b
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/settings

@ -1 +1 @@
Subproject commit 067bb8066c61726443b0c35fffb84fdc9137ea7d
Subproject commit 4bf19ff04c77c51883886af2586753df0638ffa4

8
src/settingsmanager.cpp
View file

@ -45,10 +45,12 @@ SettingsManager::SettingsManager()
, hideUserButton(_settingsItems, "hideUserButton", false)
, useCustomWindowFrame(_settingsItems, "useCustomWindowFrame", true)
{
this->showTimestamps.valueChanged.connect([this](const auto &) { this->updateWordTypeMask(); });
this->showTimestampSeconds.valueChanged.connect(
this->showTimestamps.getValueChangedSignal().connect(
[this](const auto &) { this->updateWordTypeMask(); });
this->showTimestampSeconds.getValueChangedSignal().connect(
[this](const auto &) { this->updateWordTypeMask(); });
this->showBadges.getValueChangedSignal().connect(
[this](const auto &) { this->updateWordTypeMask(); });
this->showBadges.valueChanged.connect([this](const auto &) { this->updateWordTypeMask(); });
this->enableBttvEmotes.valueChanged.connect(
[this](const auto &) { this->updateWordTypeMask(); });
this->enableEmojis.valueChanged.connect([this](const auto &) { this->updateWordTypeMask(); });

1
src/twitch/twitchmessagebuilder.cpp
View file

@ -384,7 +384,6 @@ void TwitchMessageBuilder::appendTwitchBadges(const QStringList &badges, Resourc
<< "bits"
<< ". Exception: " << e.what();
}
} else if (badge == "staff/1") {
appendWord(Word(resources.badgeStaff, Word::BadgeGlobalAuthority, QString(),
QString("Twitch Staff")));