electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash in toolbar conditions during shutdown

Browse Source 
Guard GetPcbNewSettings() calls in setupUIConditions() lambdas
against null return. The settings manager deregisters the
PCBNEW_SETTINGS object during cleanup before wxLogGui::Flush
finishes, leaving the toolbar idle update to dereference a null
pointer.
This commit is contained in:
Seth Hillbrand
2026-02-24 10:57:03 -08:00
parent f49ed45952
commit f962de966b
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcbnew/pcb_edit_frame.cpp
+10 -5
View File
@@ -1105,13 +1105,15 @@ void PCB_EDIT_FRAME::setupUIConditions()
auto globalRatsnestCond =
[this] (const SELECTION& )
{
return GetPcbNewSettings()->m_Display.m_ShowGlobalRatsnest;
PCBNEW_SETTINGS* cfg = GetPcbNewSettings();
return cfg && cfg->m_Display.m_ShowGlobalRatsnest;
};
auto curvedRatsnestCond =
[this] (const SELECTION& )
{
return GetPcbNewSettings()->m_Display.m_DisplayRatsnestLinesCurved;
PCBNEW_SETTINGS* cfg = GetPcbNewSettings();
return cfg && cfg->m_Display.m_DisplayRatsnestLinesCurved;
};
auto netHighlightCond =
@@ -1146,19 +1148,22 @@ void PCB_EDIT_FRAME::setupUIConditions()
const auto isArcKeepCenterMode =
[this]( const SELECTION& )
{
return GetPcbNewSettings()->m_ArcEditMode == ARC_EDIT_MODE::KEEP_CENTER_ADJUST_ANGLE_RADIUS;
PCBNEW_SETTINGS* cfg = GetPcbNewSettings();
return cfg && cfg->m_ArcEditMode == ARC_EDIT_MODE::KEEP_CENTER_ADJUST_ANGLE_RADIUS;
};
const auto isArcKeepEndpointMode =
[this]( const SELECTION& )
{
return GetPcbNewSettings()->m_ArcEditMode == ARC_EDIT_MODE::KEEP_ENDPOINTS_OR_START_DIRECTION;
PCBNEW_SETTINGS* cfg = GetPcbNewSettings();
return cfg && cfg->m_ArcEditMode == ARC_EDIT_MODE::KEEP_ENDPOINTS_OR_START_DIRECTION;
};
const auto isArcKeepRadiusMode =
[this]( const SELECTION& )
{
return GetPcbNewSettings()->m_ArcEditMode == ARC_EDIT_MODE::KEEP_CENTER_ENDS_ADJUST_ANGLE;
PCBNEW_SETTINGS* cfg = GetPcbNewSettings();
return cfg && cfg->m_ArcEditMode == ARC_EDIT_MODE::KEEP_CENTER_ENDS_ADJUST_ANGLE;
};
mgr->SetConditions( ACTIONS::pointEditorArcKeepCenter, CHECK( isArcKeepCenterMode ) );