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

Use wxFFileOutputStream in place of previous wxFFile switch 

wxFFile with fwrite still has a chance of partial writes.
wxFFileOutputStream provides WriteAll which will iterate until all bytes written or error.
This commit is contained in:
Marek Roszko 2020-12-12 10:44:31 -05:00
parent 6544dca056
commit 3ae87ba613
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/settings/json_settings.cpp
View File

@ -33,7 +33,7 @@
#include <wx/debug.h> #include <wx/debug.h>
#include <wx/fileconf.h> #include <wx/fileconf.h>
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/ffile.h> #include <wx/wfstream.h>
const wxChar* const traceSettings = wxT( "KICAD_SETTINGS" ); const wxChar* const traceSettings = wxT( "KICAD_SETTINGS" );
@ -392,9 +392,10 @@ bool JSON_SETTINGS::SaveToFile( const wxString& aDirectory, bool aForce )
std::stringstream buffer; std::stringstream buffer;
buffer << std::setw( 2 ) << *this << std::endl; buffer << std::setw( 2 ) << *this << std::endl;
wxFFile file( path.GetFullPath(), "wb" ); wxFFileOutputStream fileStream( path.GetFullPath(), "wb" );
if( !file.IsOpened() || !file.Write( buffer.str().c_str(), buffer.str().size() ) ) if( !fileStream.IsOk()
|| !fileStream.WriteAll( buffer.str().c_str(), buffer.str().size() ) )
{ {
wxLogTrace( traceSettings, "Warning: could not save %s", GetFullFilename() ); wxLogTrace( traceSettings, "Warning: could not save %s", GetFullFilename() );
success = false; success = false;