From 1d8795ef1b99bab1fc7e6a9d47de0d92ac86bda6 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sat, 17 Jun 2017 15:15:58 +0200 Subject: [PATCH] update settings version --- lib/settings | 2 +- src/settingsmanager.cpp | 8 +++++--- src/twitch/twitchmessagebuilder.cpp | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/settings b/lib/settings index 067bb8066..4bf19ff04 160000 --- a/lib/settings +++ b/lib/settings @@ -1 +1 @@ -Subproject commit 067bb8066c61726443b0c35fffb84fdc9137ea7d +Subproject commit 4bf19ff04c77c51883886af2586753df0638ffa4 diff --git a/src/settingsmanager.cpp b/src/settingsmanager.cpp index 517f79bc0..391a0ab5c 100644 --- a/src/settingsmanager.cpp +++ b/src/settingsmanager.cpp @@ -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(); }); diff --git a/src/twitch/twitchmessagebuilder.cpp b/src/twitch/twitchmessagebuilder.cpp index e029152f2..90fce4096 100644 --- a/src/twitch/twitchmessagebuilder.cpp +++ b/src/twitch/twitchmessagebuilder.cpp @@ -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")));