From 717250352702e3edc8513fb608c96168c08553b9 Mon Sep 17 00:00:00 2001 From: nerix Date: Sat, 25 Oct 2025 17:33:39 +0200 Subject: [PATCH] fix: Access correct channel in search popup (#6539) --- CHANGELOG.md | 1 + src/widgets/helper/SearchPopup.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e10c737e..4303feb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Minor: Added a description for the logging option under moderation tab. (#6514) - Minor: Fixed "edit hotkey" dialog opening like a normal window. (#6540) - Bugfix: Expose the "Extra extension IDs" setting on non-Windows systems too. (#6509) +- Bugfix: Fixed some commands and filters not working as expected in seach popups. (#6539) - Bugfix: Fixed settings occasionally not opening when clicking on "Manage Accounts" in the account switcher. (#6543) - Bugfix: Fixed font change not resulting in forced layout update. (#6536) - Bugfix: Fixed scrollbar rect computation potentially resulting in overflows. (#6547) diff --git a/src/widgets/helper/SearchPopup.cpp b/src/widgets/helper/SearchPopup.cpp index e63cfae2..8289118e 100644 --- a/src/widgets/helper/SearchPopup.cpp +++ b/src/widgets/helper/SearchPopup.cpp @@ -114,8 +114,8 @@ void SearchPopup::addChannel(ChannelView &channel) { if (this->searchChannels_.empty()) { - this->channelView_->setSourceChannel(channel.channel()); - this->channelName_ = channel.channel()->getName(); + this->channelView_->setSourceChannel(channel.underlyingChannel()); + this->channelName_ = channel.underlyingChannel()->getName(); } else if (this->searchChannels_.size() == 1) { @@ -137,7 +137,7 @@ void SearchPopup::goToMessage(const MessagePtr &message) { for (const auto &view : this->searchChannels_) { - const auto type = view.get().channel()->getType(); + const auto type = view.get().underlyingChannel()->getType(); if (type == Channel::Type::TwitchMentions || type == Channel::Type::TwitchAutomod) { @@ -253,7 +253,8 @@ LimitedQueueSnapshot SearchPopup::buildSnapshot() for (const auto &message : snapshot) { - if (filterSet && !filterSet->filter(message, sharedView.channel())) + if (filterSet && + !filterSet->filter(message, sharedView.underlyingChannel())) { continue; }