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

Symbol Editor: fix a crash when saving/reverting a library not present in sym-lib-table

This commit is contained in:
Maciej Suminski 2018-02-16 11:59:22 +01:00
parent 0ab15fa0ee
commit 67ccf769c7
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
eeschema/lib_manager.cpp
View File

@ -73,7 +73,7 @@ int LIB_MANAGER::GetLibraryHash( const wxString& aLibrary ) const
if( libBufIt != m_libs.end() )
return libBufIt->second.GetHash();
auto row = symTable()->FindRow( aLibrary );
auto row = GetLibrary( aLibrary );
// return -1 if library does not exist or 0 if not modified
return row ? std::hash<std::string>{}( aLibrary.ToStdString() + row->GetFullURI( true ).ToStdString() ) : -1;
@ -91,9 +91,21 @@ wxArrayString LIB_MANAGER::GetLibraryNames() const
}
SYMBOL_LIB_TABLE_ROW* LIB_MANAGER::GetLibrary( const wxString& aLibrary )
SYMBOL_LIB_TABLE_ROW* LIB_MANAGER::GetLibrary( const wxString& aLibrary ) const
{
return symTable()->FindRow( aLibrary );
SYMBOL_LIB_TABLE_ROW* row = nullptr;
try
{
row = symTable()->FindRow( aLibrary );
}
catch( const IO_ERROR& e )
{
DisplayErrorMessage( &m_frame, wxString::Format( _( "Cannot find library \"%s\" in "
"the Symbol Library Table" ), aLibrary ), e.What() );
}
return row;
}
@ -179,7 +191,7 @@ bool LIB_MANAGER::SaveLibrary( const wxString& aLibrary, const wxString& aFileNa
// clear the deleted parts buffer only if data is saved to the original file
wxFileName original, destination( aFileName );
auto row = symTable()->FindRow( aLibrary );
auto row = GetLibrary( aLibrary );
if( row )
{

2
eeschema/lib_manager.h
View File

@ -76,7 +76,7 @@ public:
/**
* Finds a single library within the (aggregate) library table.
*/
SYMBOL_LIB_TABLE_ROW* GetLibrary( const wxString& aLibrary );
SYMBOL_LIB_TABLE_ROW* GetLibrary( const wxString& aLibrary ) const;
/**
* Returns a set containing all part names for a specific library.

3
eeschema/libedit.cpp
View File

@ -249,7 +249,8 @@ void LIB_EDIT_FRAME::OnSaveAllLibraries( wxCommandEvent& event )
void LIB_EDIT_FRAME::OnRevertLibrary( wxCommandEvent& aEvent )
{
wxString libName = getTargetLib();
bool currentLib = ( libName == GetCurLib() );
wxString curLib = GetCurLib();
bool currentLib = ( libName == curLib || curLib.IsEmpty() );
// Save the current part name/unit to reload after revert
wxString alias = m_aliasName;