diff --git a/eeschema/dialogs/dialog_schematic_setup.cpp b/eeschema/dialogs/dialog_schematic_setup.cpp index a7fa200c9d..d0e0c09b42 100644 --- a/eeschema/dialogs/dialog_schematic_setup.cpp +++ b/eeschema/dialogs/dialog_schematic_setup.cpp @@ -67,6 +67,8 @@ DIALOG_SCHEMATIC_SETUP::DIALOG_SCHEMATIC_SETUP( SCH_EDIT_FRAME* aFrame ) : }, _( "Field Name Templates" ) ); m_treebook->AddPage( new wxPanel( GetTreebook() ), _( "Electrical Rules" ) ); + + m_severitiesPage = m_treebook->GetPageCount(); m_treebook->AddLazySubPage( [this]( wxWindow* aParent ) -> wxWindow* { diff --git a/eeschema/navlib/nl_schematic_plugin_impl.cpp b/eeschema/navlib/nl_schematic_plugin_impl.cpp index 26a3423c48..c661c778d2 100644 --- a/eeschema/navlib/nl_schematic_plugin_impl.cpp +++ b/eeschema/navlib/nl_schematic_plugin_impl.cpp @@ -55,6 +55,7 @@ const wxChar* NL_SCHEMATIC_PLUGIN_IMPL::m_logTrace = wxT( "KI_TRACE_NL_SCHEMATIC NL_SCHEMATIC_PLUGIN_IMPL::NL_SCHEMATIC_PLUGIN_IMPL() : CNavigation3D( false, false ), m_viewport2D( nullptr ), + m_view( nullptr ), m_isMoving( false ), m_viewportWidth( 0.0 ) { diff --git a/eeschema/sch_plugins/ltspice/ltspice_sch_parser.cpp b/eeschema/sch_plugins/ltspice/ltspice_sch_parser.cpp index c44a4f28eb..152f5d14b6 100644 --- a/eeschema/sch_plugins/ltspice/ltspice_sch_parser.cpp +++ b/eeschema/sch_plugins/ltspice/ltspice_sch_parser.cpp @@ -890,8 +890,11 @@ SCH_LABEL_BASE* LTSPICE_SCH_PARSER::CreateSCH_LABEL( KICAD_T aType, const VECTOR UNIMPLEMENTED_FOR( aType ); } - label->SetPosition( ToKicadCoords( aOffset ) + m_originOffset ); - label->SetVisible( true ); + if( label ) + { + label->SetPosition( ToKicadCoords( aOffset ) + m_originOffset ); + label->SetVisible( true ); + } return label; }