Browse Source

Fix assertion in CvPcb, Eeschema, and Pcbnew when cancel is selected from save on exit dialog.

pull/5/head
Jon Neal 11 years ago
committed by Wayne Stambaugh
parent
commit
3e398ce1c6
  1. 2
      cvpcb/cvframe.cpp
  2. 6
      eeschema/schframe.cpp
  3. 2
      pcbnew/pcbframe.cpp

2
cvpcb/cvframe.cpp

@ -235,7 +235,7 @@ void CVPCB_MAINFRAME::OnSize( wxSizeEvent& event )
void CVPCB_MAINFRAME::OnQuit( wxCommandEvent& event )
{
Close( true );
Close( false );
}

6
eeschema/schframe.cpp

@ -1127,14 +1127,16 @@ void SCH_EDIT_FRAME::OnOpenLibraryEditor( wxCommandEvent& event )
}
}
void SCH_EDIT_FRAME::OnRescueProject( wxCommandEvent& event )
{
RescueProject( true );
}
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 );
else
wxLogMessage( wxT( "addCurrentItemToList: expected type = SCH_SHEET_PIN_T, actual type = %d" ),
item->Type() );
item->Type() );
}
}
else

2
pcbnew/pcbframe.cpp

@ -567,7 +567,7 @@ void PCB_EDIT_FRAME::ReFillLayerWidget()
void PCB_EDIT_FRAME::OnQuit( wxCommandEvent& event )
{
Close( true );
Close( false );
}

Loading…
Cancel
Save