chatterino2
Code Issues

fix: Access correct channel in search popup (#6539)

Browse Source
This commit is contained in:
nerix
2025-10-25 17:33:39 +02:00
committed by GitHub
parent 7214c49e79
commit 7172503527
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -9,6 +9,7 @@
- Minor: Added a description for the logging option under moderation tab. (#6514) - Minor: Added a description for the logging option under moderation tab. (#6514)
- Minor: Fixed "edit hotkey" dialog opening like a normal window. (#6540) - 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: 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 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 font change not resulting in forced layout update. (#6536)
- Bugfix: Fixed scrollbar rect computation potentially resulting in overflows. (#6547) - Bugfix: Fixed scrollbar rect computation potentially resulting in overflows. (#6547)
src/widgets/helper/SearchPopup.cpp
+5 -4
View File
@@ -114,8 +114,8 @@ void SearchPopup::addChannel(ChannelView &channel)
{ {
if (this->searchChannels_.empty()) if (this->searchChannels_.empty())
{ {
this->channelView_->setSourceChannel(channel.channel()); this->channelView_->setSourceChannel(channel.underlyingChannel());
this->channelName_ = channel.channel()->getName(); this->channelName_ = channel.underlyingChannel()->getName();
} }
else if (this->searchChannels_.size() == 1) else if (this->searchChannels_.size() == 1)
{ {
@@ -137,7 +137,7 @@ void SearchPopup::goToMessage(const MessagePtr &message)
{ {
for (const auto &view : this->searchChannels_) 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 || if (type == Channel::Type::TwitchMentions ||
type == Channel::Type::TwitchAutomod) type == Channel::Type::TwitchAutomod)
{ {
@@ -253,7 +253,8 @@ LimitedQueueSnapshot<MessagePtr> SearchPopup::buildSnapshot()
for (const auto &message : snapshot) for (const auto &message : snapshot)
{ {
if (filterSet && !filterSet->filter(message, sharedView.channel())) if (filterSet &&
!filterSet->filter(message, sharedView.underlyingChannel()))
{ {
continue; continue;
} }