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

Fix shadowing

This commit is contained in:
Jon Evans 2021-11-20 15:32:28 -05:00
parent 1e8284bc1a
commit 22b9856a6a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/settings/settings_manager.cpp
View File

@ -531,8 +531,8 @@ bool SETTINGS_MANAGER::MigrateIfNeeded()
if( !m_migrateLibraryTables ) if( !m_migrateLibraryTables )
{ {
COMMON_SETTINGS common; COMMON_SETTINGS common;
wxString path = GetPathForSettingsFile( &common ); wxString commonPath = GetPathForSettingsFile( &common );
common.LoadFromFile( path ); common.LoadFromFile( commonPath );
const std::vector<wxString> libKeys = { const std::vector<wxString> libKeys = {
wxT( "KICAD6_SYMBOL_DIR" ), wxT( "KICAD6_SYMBOL_DIR" ),
@ -550,7 +550,7 @@ bool SETTINGS_MANAGER::MigrateIfNeeded()
for( const wxString& key : libKeys ) for( const wxString& key : libKeys )
common.m_Env.vars.erase( key ); common.m_Env.vars.erase( key );
common.SaveToFile( path ); common.SaveToFile( commonPath );
} }
return true; return true;