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

Fix Eeschema: Part library editor "save current library as" crash if no current library selected. 

Fixes: lp:1678698
https://bugs.launchpad.net/kicad/+bug/1678698
This commit is contained in:
jean-pierre charras 2017-04-03 07:58:34 +02:00
parent 2f9be81b19
commit 1f3fe6fefb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eeschema/libedit.cpp
View File

@ -291,10 +291,11 @@ void LIB_EDIT_FRAME::RedrawActiveWindow( wxDC* DC, bool EraseBg )
void LIB_EDIT_FRAME::OnSaveActiveLibrary( wxCommandEvent& event ) void LIB_EDIT_FRAME::OnSaveActiveLibrary( wxCommandEvent& event )
{ {
bool newFile = false; bool newFile = false;
if( event.GetId() == ID_LIBEDIT_SAVE_CURRENT_LIB_AS ) if( event.GetId() == ID_LIBEDIT_SAVE_CURRENT_LIB_AS )
newFile = true; newFile = true;
this->SaveActiveLibrary( newFile ); SaveActiveLibrary( newFile );
} }
@ -307,15 +308,15 @@ bool LIB_EDIT_FRAME::SaveActiveLibrary( bool newFile )
PART_LIB* lib = GetCurLib(); PART_LIB* lib = GetCurLib();
// Just in case the library hasn't been cached yet.
lib->GetCount();
if( !lib ) if( !lib )
{ {
DisplayError( this, _( "No library specified." ) ); DisplayError( this, _( "No library specified." ) );
return false; return false;
} }
// Just in case the library hasn't been cached yet.
lib->GetCount();
wxString oldFileName = lib->GetFullFileName(); wxString oldFileName = lib->GetFullFileName();
if( GetScreen()->IsModify() ) if( GetScreen()->IsModify() )

1
eeschema/libeditframe.cpp
View File

@ -166,6 +166,7 @@ BEGIN_EVENT_TABLE( LIB_EDIT_FRAME, EDA_DRAW_FRAME )
EVT_UPDATE_UI( wxID_UNDO, LIB_EDIT_FRAME::OnUpdateUndo ) EVT_UPDATE_UI( wxID_UNDO, LIB_EDIT_FRAME::OnUpdateUndo )
EVT_UPDATE_UI( wxID_REDO, LIB_EDIT_FRAME::OnUpdateRedo ) EVT_UPDATE_UI( wxID_REDO, LIB_EDIT_FRAME::OnUpdateRedo )
EVT_UPDATE_UI( ID_LIBEDIT_SAVE_CURRENT_LIB, LIB_EDIT_FRAME::OnUpdateSaveCurrentLib ) EVT_UPDATE_UI( ID_LIBEDIT_SAVE_CURRENT_LIB, LIB_EDIT_FRAME::OnUpdateSaveCurrentLib )
EVT_UPDATE_UI( ID_LIBEDIT_SAVE_CURRENT_LIB_AS, LIB_EDIT_FRAME::OnUpdateSaveCurrentLib )
EVT_UPDATE_UI( ID_LIBEDIT_VIEW_DOC, LIB_EDIT_FRAME::OnUpdateViewDoc ) EVT_UPDATE_UI( ID_LIBEDIT_VIEW_DOC, LIB_EDIT_FRAME::OnUpdateViewDoc )
EVT_UPDATE_UI( ID_LIBEDIT_EDIT_PIN_BY_PIN, LIB_EDIT_FRAME::OnUpdatePinByPin ) EVT_UPDATE_UI( ID_LIBEDIT_EDIT_PIN_BY_PIN, LIB_EDIT_FRAME::OnUpdatePinByPin )
EVT_UPDATE_UI( ID_LIBEDIT_EDIT_PIN_BY_TABLE, LIB_EDIT_FRAME::OnUpdatePinTable ) EVT_UPDATE_UI( ID_LIBEDIT_EDIT_PIN_BY_TABLE, LIB_EDIT_FRAME::OnUpdatePinTable )