Prevent wxWidgets assert (KICAD-6VM).

3 months ago · 7b0aceb99e
2 changed files with 5 additions and 2 deletions
--- a/3d-viewer/dialogs/appearance_controls_3D.cpp
+++ b/3d-viewer/dialogs/appearance_controls_3D.cpp
@ -864,7 +864,8 @@ void APPEARANCE_CONTROLS_3D::onLayerPresetChanged( wxCommandEvent& aEvent )
            if( cfg->m_CurrentPreset == name )
                cfg->m_CurrentPreset = wxEmptyString;

-            m_presetMRU.Remove( name );
+            if( m_presetMRU.Index( name ) >= 0 )
+                m_presetMRU.Remove( name );
        }

        resetSelection();
--- a/pcbnew/widgets/appearance_controls.cpp
+++ b/pcbnew/widgets/appearance_controls.cpp
@ -2802,7 +2802,9 @@ void APPEARANCE_CONTROLS::onLayerPresetChanged( wxCommandEvent& aEvent )
            preset->flipBoard    = m_cbFlipBoard->GetValue();

            index = m_cbLayerPresets->FindString( name );
-            m_presetMRU.Remove( name );
+
+            if( index != wxNOT_FOUND )
+                m_presetMRU.Remove( name );
        }

        m_currentPreset      = preset;