noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix channel search when custom scrollback limit is used (#4496)

Browse source
This commit is contained in:
kornes 2023-04-01 12:34:34 +00:00 committed by GitHub
parent 92c9137d10
commit b209c50b01
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -15,6 +15,7 @@
- Bugfix: Fixed placeholder color in Qt 6. (#4477) - Bugfix: Fixed placeholder color in Qt 6. (#4477)
- Bugfix: Fixed blocked user list being empty when opening the settings dialog for the first time. (#4437) - Bugfix: Fixed blocked user list being empty when opening the settings dialog for the first time. (#4437)
- Bugfix: Fixed blocked user list sticking around when switching from a logged in user to being logged out. (#4437) - Bugfix: Fixed blocked user list sticking around when switching from a logged in user to being logged out. (#4437)
- Bugfix: Fixed search popup ignoring setting for message scrollback limit. (#4496)
- Bugfix: Fixed a memory leak that occurred when loading message history. This was mostly noticeable with unstable internet connections where reconnections were frequent or long-running instances of Chatterino. (#4499) - Bugfix: Fixed a memory leak that occurred when loading message history. This was mostly noticeable with unstable internet connections where reconnections were frequent or long-running instances of Chatterino. (#4499)
- Dev: Disabling precompiled headers on Windows is now tested in CI. (#4472) - Dev: Disabling precompiled headers on Windows is now tested in CI. (#4472)
- Dev: Ignore unhandled BTTV user-events. (#4438) - Dev: Ignore unhandled BTTV user-events. (#4438)

1
src/common/Channel.cpp
View file

@ -28,6 +28,7 @@ Channel::Channel(const QString &name, Type type)
: completionModel(*this) : completionModel(*this)
, lastDate_(QDate::currentDate()) , lastDate_(QDate::currentDate())
, name_(name) , name_(name)
, messages_(getSettings()->scrollbackSplitLimit)
, type_(type) , type_(type)
{ {
} }

6
src/widgets/helper/SearchPopup.cpp
View file

@ -13,6 +13,7 @@
#include "messages/search/RegexPredicate.hpp" #include "messages/search/RegexPredicate.hpp"
#include "messages/search/SubstringPredicate.hpp" #include "messages/search/SubstringPredicate.hpp"
#include "messages/search/SubtierPredicate.hpp" #include "messages/search/SubtierPredicate.hpp"
#include "singletons/Settings.hpp"
#include "singletons/WindowManager.hpp" #include "singletons/WindowManager.hpp"
#include "widgets/helper/ChannelView.hpp" #include "widgets/helper/ChannelView.hpp"
#include "widgets/splits/Split.hpp" #include "widgets/splits/Split.hpp"
@ -285,8 +286,9 @@ void SearchPopup::initLayout()
// CHANNELVIEW // CHANNELVIEW
{ {
this->channelView_ = new ChannelView(this, this->split_, this->channelView_ = new ChannelView(
ChannelView::Context::Search); this, this->split_, ChannelView::Context::Search,
getSettings()->scrollbackSplitLimit);
layout1->addWidget(this->channelView_); layout1->addWidget(this->channelView_);
} }