diff --git a/CHANGELOG.md b/CHANGELOG.md index 77c4fb790..965ea6236 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - 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 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) - Dev: Disabling precompiled headers on Windows is now tested in CI. (#4472) - Dev: Ignore unhandled BTTV user-events. (#4438) diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp index e47362572..a0c963b0b 100644 --- a/src/common/Channel.cpp +++ b/src/common/Channel.cpp @@ -28,6 +28,7 @@ Channel::Channel(const QString &name, Type type) : completionModel(*this) , lastDate_(QDate::currentDate()) , name_(name) + , messages_(getSettings()->scrollbackSplitLimit) , type_(type) { } diff --git a/src/widgets/helper/SearchPopup.cpp b/src/widgets/helper/SearchPopup.cpp index 0c0f05527..75f80e231 100644 --- a/src/widgets/helper/SearchPopup.cpp +++ b/src/widgets/helper/SearchPopup.cpp @@ -13,6 +13,7 @@ #include "messages/search/RegexPredicate.hpp" #include "messages/search/SubstringPredicate.hpp" #include "messages/search/SubtierPredicate.hpp" +#include "singletons/Settings.hpp" #include "singletons/WindowManager.hpp" #include "widgets/helper/ChannelView.hpp" #include "widgets/splits/Split.hpp" @@ -285,8 +286,9 @@ void SearchPopup::initLayout() // CHANNELVIEW { - this->channelView_ = new ChannelView(this, this->split_, - ChannelView::Context::Search); + this->channelView_ = new ChannelView( + this, this->split_, ChannelView::Context::Search, + getSettings()->scrollbackSplitLimit); layout1->addWidget(this->channelView_); }