Skip to content

Commit

Permalink
Merge pull request #80847 from bruvzg/rtl_rem_para
Browse files Browse the repository at this point in the history
[RTL] Fix `remove_paragraph` crashes
  • Loading branch information
akien-mga committed Aug 21, 2023
2 parents 170ae3a + cd6b036 commit ddb7430
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions scene/gui/rich_text_label.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3213,17 +3213,19 @@ bool RichTextLabel::remove_paragraph(const int p_paragraph) {

if (!had_newline) {
current_frame->lines.remove_at(p_paragraph);
if (current_frame->lines.size() == 0) {
current_frame->lines.resize(1);
}
}

if (current_frame->lines.is_empty()) {
current_frame->lines.resize(1);
}

if (p_paragraph == 0 && current->subitems.size() > 0) {
main->lines[0].from = main;
}

int to_line = main->first_invalid_line.load();
main->first_invalid_line.store(MIN(to_line, p_paragraph));
main->first_invalid_line.store(MIN(main->first_invalid_line.load(), p_paragraph));
main->first_resized_line.store(MIN(main->first_resized_line.load(), p_paragraph));
main->first_invalid_font_line.store(MIN(main->first_invalid_font_line.load(), p_paragraph));
queue_redraw();

return true;
Expand Down

0 comments on commit ddb7430

Please sign in to comment.