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

Don't store address of temp object. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15517
This commit is contained in:
Jeff Young 2023-08-27 19:02:12 +01:00
parent a470cab7b2
commit b5dc9ddbe0
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/sch_commit.cpp
View File

@ -490,8 +490,8 @@ void SCH_COMMIT::Revert()
if( field->GetId() == REFERENCE_FIELD ) if( field->GetId() == REFERENCE_FIELD )
{ {
symbol->SetRef( schematic->GetSheets().FindSheetForScreen( screen ), SCH_SHEET_PATH sheet = schematic->GetSheets().FindSheetForScreen( screen );
field->GetText() ); symbol->SetRef( &sheet, field->GetText() );
} }
} }

6
eeschema/sch_sheet_path.cpp
View File

@ -1045,15 +1045,15 @@ SCH_SHEET_PATH* SCH_SHEET_LIST::FindSheetForPath( const SCH_SHEET_PATH* aPath )
} }
SCH_SHEET_PATH* SCH_SHEET_LIST::FindSheetForScreen( const SCH_SCREEN* aScreen ) SCH_SHEET_PATH SCH_SHEET_LIST::FindSheetForScreen( const SCH_SCREEN* aScreen )
{ {
for( SCH_SHEET_PATH& sheetpath : *this ) for( SCH_SHEET_PATH& sheetpath : *this )
{ {
if( sheetpath.LastScreen() == aScreen ) if( sheetpath.LastScreen() == aScreen )
return &sheetpath; return sheetpath;
} }
return nullptr; return SCH_SHEET_PATH();
} }

6
eeschema/sch_sheet_path.h
View File

@ -573,10 +573,10 @@ public:
SCH_SHEET_PATH* FindSheetForPath( const SCH_SHEET_PATH* aPath ); SCH_SHEET_PATH* FindSheetForPath( const SCH_SHEET_PATH* aPath );
/** /**
* Return a pointer to the first #SCH_SHEET_PATH object (not necessarily the only one) using * Return the first #SCH_SHEET_PATH object (not necessarily the only one) using a particular
* a particular screen. * screen.
*/ */
SCH_SHEET_PATH* FindSheetForScreen( const SCH_SCREEN* aScreen ); SCH_SHEET_PATH FindSheetForScreen( const SCH_SCREEN* aScreen );
/** /**
* Return a #SCH_SHEET_LIST with a copy of all the #SCH_SHEET_PATH using a particular screen. * Return a #SCH_SHEET_LIST with a copy of all the #SCH_SHEET_PATH using a particular screen.

6
eeschema/schematic_undo_redo.cpp
View File

@ -313,7 +313,7 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList )
} }
else if( status == UNDO_REDO::PAGESETTINGS ) else if( status == UNDO_REDO::PAGESETTINGS )
{ {
SCH_SHEET_PATH& undoSheet = *m_schematic->GetSheets().FindSheetForScreen( screen ); SCH_SHEET_PATH undoSheet = m_schematic->GetSheets().FindSheetForScreen( screen );
if( GetCurrentSheet() != undoSheet ) if( GetCurrentSheet() != undoSheet )
{ {
@ -355,8 +355,8 @@ void SCH_EDIT_FRAME::PutDataInPreviousState( PICKED_ITEMS_LIST* aList )
if( field->GetId() == REFERENCE_FIELD ) if( field->GetId() == REFERENCE_FIELD )
{ {
symbol->SetRef( m_schematic->GetSheets().FindSheetForScreen( screen ), SCH_SHEET_PATH sheet = m_schematic->GetSheets().FindSheetForScreen( screen );
field->GetText() ); symbol->SetRef( &sheet, field->GetText() );
} }
bulkChangedItems.emplace_back( symbol ); bulkChangedItems.emplace_back( symbol );