diff --git a/cmake/KiCadVersion.cmake b/cmake/KiCadVersion.cmake index 4b57f0ee75..a791023758 100644 --- a/cmake/KiCadVersion.cmake +++ b/cmake/KiCadVersion.cmake @@ -37,7 +37,7 @@ # KiCad. # # Note: This version string should follow the semantic versioning system -set( KICAD_SEMANTIC_VERSION "7.0.10-rc1" ) +set( KICAD_SEMANTIC_VERSION "7.0.10" ) # Default the version to the semantic version. # This is overridden by the git repository tag though (if using git) diff --git a/eeschema/tools/sch_editor_control.cpp b/eeschema/tools/sch_editor_control.cpp index c35c7a5586..ee27a7f9a2 100644 --- a/eeschema/tools/sch_editor_control.cpp +++ b/eeschema/tools/sch_editor_control.cpp @@ -332,7 +332,8 @@ void SCH_EDITOR_CONTROL::doCrossProbeSchToPcb( const TOOL_EVENT& aEvent, bool aF int SCH_EDITOR_CONTROL::ExportSymbolsToLibrary( const TOOL_EVENT& aEvent ) { - bool savePowerSymbols = IsOK( m_frame, _( "Include power symbols in schematic to the library?" ) ); + bool savePowerSymbols = IsOK( m_frame, + _( "Include power symbols in schematic to the library?" ) ); bool createNew = aEvent.IsAction( &EE_ACTIONS::exportSymbolsToNewLibrary ); @@ -425,7 +426,19 @@ int SCH_EDITOR_CONTROL::ExportSymbolsToLibrary( const TOOL_EVENT& aEvent ) LIB_SYMBOL* origSym = it.second; LIB_SYMBOL* newSym = origSym->Flatten().release(); - pi->SaveSymbol( dest.GetFullPath(), newSym ); + try + { + pi->SaveSymbol( dest.GetFullPath(), newSym ); + } + catch( const IO_ERROR& ioe ) + { + wxString msg; + msg.Printf( _( "Error saving symbol %s to library '%s'." ), + newSym->GetName(), row->GetNickName() ); + msg += wxS( "\n\n" ) + ioe.What(); + wxLogWarning( msg ); + return 0; + } if( map ) { @@ -434,7 +447,8 @@ int SCH_EDITOR_CONTROL::ExportSymbolsToLibrary( const TOOL_EVENT& aEvent ) for( SCH_SYMBOL* symbol : symbolMap[it.first] ) { - m_frame->SaveCopyInUndoList( m_frame->GetScreen(), symbol, UNDO_REDO::CHANGED, append, false); + m_frame->SaveCopyInUndoList( m_frame->GetScreen(), symbol, UNDO_REDO::CHANGED, + append, false ); symbol->SetLibId( id ); append = true; }