kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Sketcher: Fix segfault when activating a tool in a different view

Browse Source 
=================================================================

When in Sketcher edit mode, a tool button is activated, while the view has been changing to view of a different type, it segfaults.

This commit checks the pointer of the view to ensure correct type before activation, and refusing to activate if not of the correct type.

fixes #10809
This commit is contained in:
Abdullah Tahiri
2023-10-01 08:48:08 +02:00
committed by abdullahtahiriyo
parent 2ea27064d5
commit c7b99b9fbb
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/Sketcher/Gui/DrawSketchHandler.cpp
View File

@@ -283,14 +283,20 @@ void DrawSketchHandler::activate(ViewProviderSketch* vp)
sketchgui = vp;
// save the cursor at the time the DSH is activated
Gui::MDIView* view = Gui::getMainWindow()->activeWindow();
Gui::View3DInventorViewer* viewer = static_cast<Gui::View3DInventor*>(view)->getViewer();
oldCursor = viewer->getWidget()->cursor();
auto* view = dynamic_cast<Gui::View3DInventor*>(Gui::getMainWindow()->activeWindow());
updateCursor();
if (view) {
Gui::View3DInventorViewer* viewer = dynamic_cast<Gui::View3DInventor*>(view)->getViewer();
oldCursor = viewer->getWidget()->cursor();
this->preActivated();
this->activated();
updateCursor();
this->preActivated();
this->activated();
}
else {
sketchgui->purgeHandler();
}
}
void DrawSketchHandler::deactivate()

11
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@@ -565,10 +565,13 @@ void ViewProviderSketch::purgeHandler()
Gui::Selection().clearSelection();
// ensure that we are in sketch only selection mode
Gui::MDIView* mdi = Gui::Application::Instance->editDocument()->getActiveView();
Gui::View3DInventorViewer* viewer;
viewer = static_cast<Gui::View3DInventor*>(mdi)->getViewer();
viewer->setSelectionEnabled(false);
auto* view = dynamic_cast<Gui::View3DInventor*>(Gui::Application::Instance->editDocument()->getActiveView());
if(view) {
Gui::View3DInventorViewer* viewer;
viewer = static_cast<Gui::View3DInventor*>(view)->getViewer();
viewer->setSelectionEnabled(false);
}
}
void ViewProviderSketch::setAxisPickStyle(bool on)