Fix assertion in CvPcb, Eeschema, and Pcbnew when cancel is selected from save on exit dialog.
This commit is contained in:
parent
928e155450
commit
3e398ce1c6
|
@ -235,7 +235,7 @@ void CVPCB_MAINFRAME::OnSize( wxSizeEvent& event )
|
||||||
|
|
||||||
void CVPCB_MAINFRAME::OnQuit( wxCommandEvent& event )
|
void CVPCB_MAINFRAME::OnQuit( wxCommandEvent& event )
|
||||||
{
|
{
|
||||||
Close( true );
|
Close( false );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1127,14 +1127,16 @@ void SCH_EDIT_FRAME::OnOpenLibraryEditor( wxCommandEvent& event )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void SCH_EDIT_FRAME::OnRescueProject( wxCommandEvent& event )
|
void SCH_EDIT_FRAME::OnRescueProject( wxCommandEvent& event )
|
||||||
{
|
{
|
||||||
RescueProject( true );
|
RescueProject( true );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void SCH_EDIT_FRAME::OnExit( wxCommandEvent& event )
|
void SCH_EDIT_FRAME::OnExit( wxCommandEvent& event )
|
||||||
{
|
{
|
||||||
Close( true );
|
Close( false );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -1266,7 +1268,7 @@ void SCH_EDIT_FRAME::addCurrentItemToList( wxDC* aDC )
|
||||||
( (SCH_SHEET*)undoItem )->AddPin( (SCH_SHEET_PIN*) item );
|
( (SCH_SHEET*)undoItem )->AddPin( (SCH_SHEET_PIN*) item );
|
||||||
else
|
else
|
||||||
wxLogMessage( wxT( "addCurrentItemToList: expected type = SCH_SHEET_PIN_T, actual type = %d" ),
|
wxLogMessage( wxT( "addCurrentItemToList: expected type = SCH_SHEET_PIN_T, actual type = %d" ),
|
||||||
item->Type() );
|
item->Type() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -567,7 +567,7 @@ void PCB_EDIT_FRAME::ReFillLayerWidget()
|
||||||
|
|
||||||
void PCB_EDIT_FRAME::OnQuit( wxCommandEvent& event )
|
void PCB_EDIT_FRAME::OnQuit( wxCommandEvent& event )
|
||||||
{
|
{
|
||||||
Close( true );
|
Close( false );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue