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

Fix temporary file bug when saving modified footprints. (fixes lp:1384550) 

* Use wxRenameFile which falls back to a file copy and file remove when
  wxRename fails.
This commit is contained in:
Luis 2014-10-23 16:25:04 -04:00 committed by Wayne Stambaugh
parent f12953855e
commit 83d666806c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcbnew/kicad_plugin.cpp
View File

@ -246,7 +246,11 @@ void FP_CACHE::Save()
wxRemove( fn.GetFullPath() ); // it is not an error if this does not exist wxRemove( fn.GetFullPath() ); // it is not an error if this does not exist
if( wxRename( tempFileName, fn.GetFullPath() ) ) // Even on linux you can see an _intermittent_ error when calling wxRename(),
// and it is fully inexplicable. See if this dodges the error.
wxMilliSleep( 250L );
if( !wxRenameFile( tempFileName, fn.GetFullPath() ) )
{ {
wxString msg = wxString::Format( wxString msg = wxString::Format(
_( "Cannot rename temporary file '%s' to footprint library file '%s'" ), _( "Cannot rename temporary file '%s' to footprint library file '%s'" ),

2
pcbnew/legacy_plugin.cpp
View File

@ -4487,7 +4487,7 @@ void LP_CACHE::Save()
// and it is fully inexplicable. See if this dodges the error. // and it is fully inexplicable. See if this dodges the error.
wxMilliSleep( 250L ); wxMilliSleep( 250L );
if( wxRename( tempFileName, m_lib_path ) ) if( !wxRenameFile( tempFileName, m_lib_path ) )
{ {
THROW_IO_ERROR( wxString::Format( THROW_IO_ERROR( wxString::Format(
_( "Unable to rename tempfile '%s' to library file '%s'" ), _( "Unable to rename tempfile '%s' to library file '%s'" ),