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

Fix project saving in pcbnew standalone when project is new 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/8244
This commit is contained in:
Jon Evans 2021-04-20 20:59:51 -04:00
parent 8792d7288d
commit 693413b47e
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/settings/settings_manager.cpp
View File

@ -912,6 +912,15 @@ void SETTINGS_MANAGER::SaveProjectAs( const wxString& aFullPath )
{ {
wxString oldName = Prj().GetProjectFullName(); wxString oldName = Prj().GetProjectFullName();
// Side effect: clear read-only status
Prj().SetReadOnly( false );
if( aFullPath.IsSameAs( oldName ) )
{
SaveProject( aFullPath );
return;
}
// Changing this will cause UnloadProject to not save over the "old" project when loading below // Changing this will cause UnloadProject to not save over the "old" project when loading below
Prj().setProjectFullName( aFullPath ); Prj().setProjectFullName( aFullPath );
@ -938,6 +947,9 @@ void SETTINGS_MANAGER::SaveProjectCopy( const wxString& aFullPath )
wxString oldName = project->GetFilename(); wxString oldName = project->GetFilename();
wxFileName fn( aFullPath ); wxFileName fn( aFullPath );
bool readOnly = project->IsReadOnly();
project->SetReadOnly( false );
project->SetFilename( fn.GetName() ); project->SetFilename( fn.GetName() );
project->SaveToFile( fn.GetPath() ); project->SaveToFile( fn.GetPath() );
project->SetFilename( oldName ); project->SetFilename( oldName );
@ -945,6 +957,8 @@ void SETTINGS_MANAGER::SaveProjectCopy( const wxString& aFullPath )
Prj().GetLocalSettings().SetFilename( fn.GetName() ); Prj().GetLocalSettings().SetFilename( fn.GetName() );
Prj().GetLocalSettings().SaveToFile( fn.GetPath() ); Prj().GetLocalSettings().SaveToFile( fn.GetPath() );
Prj().GetLocalSettings().SetFilename( oldName ); Prj().GetLocalSettings().SetFilename( oldName );
project->SetReadOnly( readOnly );
} }