From df0f6262839b32bfa0b15925cbfc565f059ebdfd Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Tue, 14 Feb 2023 21:01:56 -0500 Subject: [PATCH] Properties: remove assertion that no longer makes sense (cherry picked from commit e5b376721dd94a2e0089b26cb8288bb7887f7fe2) --- common/widgets/properties_panel.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/common/widgets/properties_panel.cpp b/common/widgets/properties_panel.cpp index daf79ebb71..84d7173fcc 100644 --- a/common/widgets/properties_panel.cpp +++ b/common/widgets/properties_panel.cpp @@ -217,10 +217,13 @@ void PROPERTIES_PANEL::rebuildProperties( const SELECTION& aSelection ) for( wxPropertyGridIterator it = m_grid->GetIterator(); !it.AtEnd(); it.Next() ) { - wxPGProperty* pgProp = it.GetProperty(); - + wxPGProperty* pgProp = it.GetProperty(); PROPERTY_BASE* property = propMgr.GetProperty( TYPE_HASH( *firstItem ), pgProp->GetName() ); - wxCHECK2( property, continue ); + + // Switching item types? Property may no longer be valid + if( !property ) + continue; + wxVariant commonVal; extractValueAndWritability( aSelection, property, commonVal, writeable );