noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove bad asserts from IRC text wrapping code (#2446)

Browse source
This commit is contained in:
pajlada 2021-02-11 12:52:50 +01:00 committed by GitHub
parent 4a53472215
commit 303b079257
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/messages/MessageElement.cpp
View file

@ -611,7 +611,7 @@ void IrcTextElement::addToContainer(MessageLayoutContainer &container,
} }
} }
// we done goofed, we need to wrap the text // The word does not fit on a new line, we need to wrap it
QString text = word.text; QString text = word.text;
std::vector<Segment> segments = word.segments; std::vector<Segment> segments = word.segments;
int textLength = text.length(); int textLength = text.length();
@ -625,6 +625,7 @@ void IrcTextElement::addToContainer(MessageLayoutContainer &container,
{ {
if (!container.canAddElements()) if (!container.canAddElements())
{ {
// The container does not allow any more elements to be added, stop here
break; break;
} }
@ -638,11 +639,10 @@ void IrcTextElement::addToContainer(MessageLayoutContainer &container,
{ {
std::vector<Segment> pieceSegments; std::vector<Segment> pieceSegments;
int charactersLeft = i - wordStart; int charactersLeft = i - wordStart;
assert(charactersLeft > 0);
for (auto segmentIt = segments.begin(); for (auto segmentIt = segments.begin();
segmentIt != segments.end();) segmentIt != segments.end();)
{ {
assert(charactersLeft > 0);
auto &segment = *segmentIt; auto &segment = *segmentIt;
if (charactersLeft >= segment.text.length()) if (charactersLeft >= segment.text.length())
{ {