Fixed segfault that occurs when undoing while drawing
This commit is contained in:
parent
0a8add3df1
commit
7f905f01df
5 changed files with 9 additions and 11 deletions
|
|
@ -274,12 +274,11 @@ void TextBoxTool::update_textbox_network(const std::shared_ptr<DrawTextBox>& tex
|
|||
}
|
||||
|
||||
void TextBoxTool::commit() {
|
||||
if(controls.intermediateItem) {
|
||||
if(controls.intermediateItem && controls.intermediateItem->collabListInfo.lock()) {
|
||||
controls.intermediateItem->client_send_update_final(drawP);
|
||||
controls.intermediateItem->final_update(drawP);
|
||||
//controls.intermediateItem->currentlyUpdating = true; // It remains true, as we are about to start writing into the text box we just placed
|
||||
controls.intermediateItem = nullptr;
|
||||
}
|
||||
controls.intermediateItem = nullptr;
|
||||
}
|
||||
|
||||
void TextBoxTool::draw(SkCanvas* canvas, const DrawData& drawData) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue