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

Don't lose track of the sheet's screen 

Corner cases need to clear screen before loading a new file.  Aborting
needs to restore the screen or risk segfaults

Fixes https://gitlab.com/kicad/code/kicad/issues/9739
This commit is contained in:
Seth Hillbrand 2021-11-23 10:55:01 -08:00
parent 1c3e1df3ca
commit 65fc47cb8f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eeschema/dialogs/dialog_sheet_properties.cpp
View File

@ -445,6 +445,7 @@ bool DIALOG_SHEET_PROPERTIES::onSheetFilenameChanged( const wxString& aNewFilena
bool restoreSheet = false;
bool isExistingSheet = false;
SCH_SCREEN* useScreen = nullptr;
SCH_SCREEN* oldScreen = nullptr;
// Search for a schematic file having the same filename already in use in the hierarchy
// or on disk, in order to reuse it.
@ -575,6 +576,7 @@ bool DIALOG_SHEET_PROPERTIES::onSheetFilenameChanged( const wxString& aNewFilena
// the screen reference counting in complex hierarchies.
if( m_sheet->GetScreenCount() > 1 )
{
oldScreen = m_sheet->GetScreen();
m_sheet->SetScreen( nullptr );
loadFromFile = true;
}
@ -617,7 +619,13 @@ bool DIALOG_SHEET_PROPERTIES::onSheetFilenameChanged( const wxString& aNewFilena
|| m_frame->CheckSheetForRecursion( m_sheet, &currentSheet ) )
{
if( restoreSheet )
{
// If we cleared the previous screen, restore it before returning to the user
if( oldScreen )
m_sheet->SetScreen( oldScreen );
currentSheet.LastScreen()->Append( m_sheet );
}
return false;
}