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

Try to make message-replacing more crash-resistant

Browse source
This commit is contained in:
Rasmus Karlsson 2018-06-18 20:03:09 +02:00
parent 635d4b2341
commit 7578743b74
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/widgets/helper/channelview.cpp
View file

@ -443,13 +443,21 @@ void ChannelView::setChannel(ChannelPtr newChannel)
this->channelConnections_.push_back( this->channelConnections_.push_back(
newChannel->messageReplaced.connect([this](size_t index, MessagePtr replacement) { newChannel->messageReplaced.connect([this](size_t index, MessagePtr replacement) {
MessageLayoutPtr newItem(new MessageLayout(replacement)); MessageLayoutPtr newItem(new MessageLayout(replacement));
if (this->messages.getSnapshot()[index]->flags & MessageLayout::AlternateBackground) { auto snapshot = this->messages.getSnapshot();
if (index >= snapshot.getLength()) {
debug::Log("Tried to replace out of bounds message. Index: {}. Length: {}", index,
snapshot.getLength());
return;
}
const auto &message = snapshot[index];
if (message->flags & MessageLayout::AlternateBackground) {
newItem->flags |= MessageLayout::AlternateBackground; newItem->flags |= MessageLayout::AlternateBackground;
} }
this->scrollBar.replaceHighlight(index, replacement->getScrollBarHighlight()); this->scrollBar.replaceHighlight(index, replacement->getScrollBarHighlight());
this->messages.replaceItem(this->messages.getSnapshot()[index], newItem); this->messages.replaceItem(message, newItem);
this->layoutMessages(); this->layoutMessages();
})); }));