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

Add try/catch block around writing a new library. 

Fixes: lp:1825203
* https://bugs.launchpad.net/kicad/+bug/1825203
This commit is contained in:
Jeff Young 2019-04-18 22:00:04 +01:00
parent cc18464f8f
commit 2bcf38d2b6
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
eeschema/libedit/lib_manager.cpp
View File

@ -645,14 +645,15 @@ bool LIB_MANAGER::addLibrary( const wxString& aFilePath, bool aCreate, SYMBOL_LI
if( aCreate ) if( aCreate )
{ {
// CreateSymbolLib() fails if the file exists try
if( wxFileName::Exists( aFilePath ) )
{ {
if( !wxRemoveFile( aFilePath ) ) aTable->CreateSymbolLib( libName );
}
catch( const IO_ERROR& e )
{
aTable->RemoveRow( libRow );
return false; return false;
} }
aTable->CreateSymbolLib( libName );
} }
m_frame.SyncLibraries( false ); m_frame.SyncLibraries( false );
@ -682,10 +683,12 @@ std::set<LIB_PART*> LIB_MANAGER::getOriginalParts( const wxString& aLibrary )
LIB_ALIAS* alias = symTable()->LoadSymbol( aLibrary, aliasName ); LIB_ALIAS* alias = symTable()->LoadSymbol( aLibrary, aliasName );
parts.insert( alias->GetPart() ); parts.insert( alias->GetPart() );
} }
} catch( const IO_ERROR& e ) }
catch( const IO_ERROR& e )
{ {
DisplayErrorMessage( &m_frame, wxString::Format( _( "Cannot enumerate " DisplayErrorMessage( &m_frame, wxString::Format( _( "Cannot enumerate library \"%s\"" ),
"library \"%s\"" ), aLibrary ), e.What() ); aLibrary ),
e.What() );
} }
return parts; return parts;

18
include/lib_table_base.h
View File

@ -414,6 +414,24 @@ public:
*/ */
bool InsertRow( LIB_TABLE_ROW* aRow, bool doReplace = false ); bool InsertRow( LIB_TABLE_ROW* aRow, bool doReplace = false );
/**
* Removes a row from the table.
* @param aRow is the row to remove
* @return true if the row was found (and removed)
*/
bool RemoveRow( LIB_TABLE_ROW* aRow )
{
for( auto iter = rows.begin(); iter != rows.end(); ++iter )
{
if( *iter == *aRow )
{
rows.erase( iter, iter + 1 );
return true;
}
}
return false;
}
/** /**
* @return a #LIB_TABLE_ROW pointer if \a aURI is found in this table or in any chained * @return a #LIB_TABLE_ROW pointer if \a aURI is found in this table or in any chained
* fallBack table fragments, else NULL. * fallBack table fragments, else NULL.