haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eeschema: fix crash in SCH_SHEET_LIST::MigrateSimModelNameFields() for SCH_TXTBOX items. 

Due to a typo, if a SCH_TXTBOX is in a scheet, it crashes eeschema.
This commit is contained in:
jean-pierre charras 2022-07-30 15:57:59 +02:00
parent 4915f6ca20
commit ee1d458af0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eeschema/sch_sheet_path.cpp
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2017 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2011 Wayne Stambaugh <stambaughw@gmail.com> * Copyright (C) 2011 Wayne Stambaugh <stambaughw@gmail.com>
* Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -31,6 +31,7 @@
#include <sch_sheet_path.h> #include <sch_sheet_path.h>
#include <sch_symbol.h> #include <sch_symbol.h>
#include <sch_sheet.h> #include <sch_sheet.h>
#include <sch_textbox.h>
#include <schematic.h> #include <schematic.h>
#include <template_fieldnames.h> #include <template_fieldnames.h>
#include <trace_helpers.h> #include <trace_helpers.h>
@ -1012,7 +1013,7 @@ void SCH_SHEET_LIST::UpdateSymbolInstances(
it->m_Footprint ); it->m_Footprint );
symbol->GetField( REFERENCE_FIELD )->SetText( it->m_Reference ); symbol->GetField( REFERENCE_FIELD )->SetText( it->m_Reference );
} }
if( size() >= 1 && at( 0 ).LastScreen()->GetFileFormatVersionAtLoad() < 20220622 ) if( size() >= 1 && at( 0 ).LastScreen()->GetFileFormatVersionAtLoad() < 20220622 )
MigrateSimModelNameFields(); MigrateSimModelNameFields();
} }
@ -1145,7 +1146,7 @@ void SCH_SHEET_LIST::MigrateSimModelNameFields()
for( SCH_ITEM* item : screen->Items().OfType( SCH_TEXTBOX_T ) ) for( SCH_ITEM* item : screen->Items().OfType( SCH_TEXTBOX_T ) )
{ {
wxString text = static_cast<SCH_TEXT*>( item )->GetShownText(); wxString text = static_cast<SCH_TEXTBOX*>( item )->GetShownText();
if( text.StartsWith( ".inc" ) || text.StartsWith( ".lib" ) if( text.StartsWith( ".inc" ) || text.StartsWith( ".lib" )
|| text.StartsWith( ".model" ) || text.StartsWith( ".subckt" ) ) || text.StartsWith( ".model" ) || text.StartsWith( ".subckt" ) )