chatterino2
Code Issues

fix: reuse one channel for emote search (#5946)

Browse Source
This commit is contained in:
nerix
2025-02-11 09:49:20 +01:00
committed by GitHub
parent 2b118c9aa2
commit b7e03adc21
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -22,6 +22,7 @@
- Bugfix: Fixed the reply button showing for inline whispers and announcements. (#5863) - Bugfix: Fixed the reply button showing for inline whispers and announcements. (#5863)
- Bugfix: Fixed suspicious user treatment update messages not being searchable. (#5865) - Bugfix: Fixed suspicious user treatment update messages not being searchable. (#5865)
- Bugfix: Ensure miniaudio backend exits even if it doesn't exit cleanly. (#5896) - Bugfix: Ensure miniaudio backend exits even if it doesn't exit cleanly. (#5896)
- Bugfix: Fixed search in emote popup not always working correctly. (#5946)
- Bugfix: Fixed channel point redemptions with messages not showing up if PubSub is disconnected. (#5948) - Bugfix: Fixed channel point redemptions with messages not showing up if PubSub is disconnected. (#5948)
- Dev: Add initial experimental EventSub support. (#5837, #5895, #5897, #5904, #5910, #5903, #5915, #5916, #5930, #5935, #5932, #5943) - Dev: Add initial experimental EventSub support. (#5837, #5895, #5897, #5904, #5910, #5903, #5915, #5916, #5930, #5935, #5932, #5943)
- Dev: Remove unneeded platform specifier for toasts. (#5914) - Dev: Remove unneeded platform specifier for toasts. (#5914)
src/widgets/dialogs/EmotePopup.cpp
+4 -3
View File
@@ -430,6 +430,8 @@ void EmotePopup::loadChannel(ChannelPtr channel)
std::make_shared<Channel>("", Channel::Type::None)); std::make_shared<Channel>("", Channel::Type::None));
this->channelEmotesView_->setChannel( this->channelEmotesView_->setChannel(
std::make_shared<Channel>("", Channel::Type::None)); std::make_shared<Channel>("", Channel::Type::None));
this->searchView_->setChannel(
std::make_shared<Channel>("", Channel::Type::None));
this->reloadEmotes(); this->reloadEmotes();
} }
@@ -606,7 +608,8 @@ void EmotePopup::filterEmotes(const QString &searchText)
return; return;
} }
auto searchChannel = std::make_shared<Channel>("", Channel::Type::None); auto searchChannel = this->searchView_->underlyingChannel();
searchChannel->clearMessages();
// true in special channels like /mentions // true in special channels like /mentions
if (this->channel_->isTwitchChannel()) if (this->channel_->isTwitchChannel())
@@ -632,8 +635,6 @@ void EmotePopup::filterEmotes(const QString &searchText)
loadEmojis(*searchChannel, filteredEmojis, "Emojis"); loadEmojis(*searchChannel, filteredEmojis, "Emojis");
} }
this->searchView_->setChannel(searchChannel);
this->notebook_->hide(); this->notebook_->hide();
this->searchView_->show(); this->searchView_->show();
} }