Check if object pointer is null before commit

This commit is contained in:
Yousef Khadadeh 2025-12-15 16:55:09 +03:00
parent 5daf1ce6c0
commit c57ea608c3
5 changed files with 25 additions and 17 deletions

View file

@ -153,11 +153,13 @@ void BrushTool::tool_update() {
} }
void BrushTool::commit_stroke() { void BrushTool::commit_stroke() {
if(objInfoBeingEdited) {
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj; NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
containerPtr->commit_update(drawP); containerPtr->commit_update(drawP);
containerPtr->send_comp_update(drawP, true); containerPtr->send_comp_update(drawP, true);
objInfoBeingEdited = nullptr; objInfoBeingEdited = nullptr;
} }
}
void BrushTool::gui_toolbox() { void BrushTool::gui_toolbox() {
Toolbar& t = drawP.world.main.toolbar; Toolbar& t = drawP.world.main.toolbar;

View file

@ -57,8 +57,8 @@ void EditTool::switch_tool(DrawingProgramToolType newTool) {
compEditTool->commit_edit_updates(objInfoBeingEdited, prevData); compEditTool->commit_edit_updates(objInfoBeingEdited, prevData);
objInfoBeingEdited->obj->commit_update(drawP); objInfoBeingEdited->obj->commit_update(drawP);
objInfoBeingEdited->obj->send_comp_update(drawP, true); objInfoBeingEdited->obj->send_comp_update(drawP, true);
}
objInfoBeingEdited = nullptr; objInfoBeingEdited = nullptr;
}
pointHandles.clear(); pointHandles.clear();
pointDragging = nullptr; pointDragging = nullptr;
isEditing = false; isEditing = false;

View file

@ -97,11 +97,13 @@ bool EllipseDrawTool::prevent_undo_or_redo() {
} }
void EllipseDrawTool::commit() { void EllipseDrawTool::commit() {
if(objInfoBeingEdited) {
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj; NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
containerPtr->commit_update(drawP); containerPtr->commit_update(drawP);
containerPtr->send_comp_update(drawP, true); containerPtr->send_comp_update(drawP, true);
objInfoBeingEdited = nullptr; objInfoBeingEdited = nullptr;
} }
}
void EllipseDrawTool::draw(SkCanvas* canvas, const DrawData& drawData) { void EllipseDrawTool::draw(SkCanvas* canvas, const DrawData& drawData) {
} }

View file

@ -96,11 +96,13 @@ bool RectDrawTool::prevent_undo_or_redo() {
} }
void RectDrawTool::commit() { void RectDrawTool::commit() {
if(objInfoBeingEdited) {
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj; NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
containerPtr->commit_update(drawP); containerPtr->commit_update(drawP);
containerPtr->send_comp_update(drawP, true); containerPtr->send_comp_update(drawP, true);
objInfoBeingEdited = nullptr; objInfoBeingEdited = nullptr;
} }
}
void RectDrawTool::draw(SkCanvas* canvas, const DrawData& drawData) { void RectDrawTool::draw(SkCanvas* canvas, const DrawData& drawData) {
} }

View file

@ -96,11 +96,13 @@ bool TextBoxTool::prevent_undo_or_redo() {
} }
void TextBoxTool::commit() { void TextBoxTool::commit() {
if(objInfoBeingEdited) {
NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj; NetworkingObjects::NetObjOwnerPtr<CanvasComponentContainer>& containerPtr = objInfoBeingEdited->obj;
containerPtr->commit_update(drawP); containerPtr->commit_update(drawP);
containerPtr->send_comp_update(drawP, true); containerPtr->send_comp_update(drawP, true);
objInfoBeingEdited = nullptr; objInfoBeingEdited = nullptr;
} }
}
void TextBoxTool::draw(SkCanvas* canvas, const DrawData& drawData) { void TextBoxTool::draw(SkCanvas* canvas, const DrawData& drawData) {
} }