From 22b9856a6a54ebfc183ede2ec19c542b4771bdaf Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Sat, 20 Nov 2021 15:32:28 -0500 Subject: [PATCH] Fix shadowing --- common/settings/settings_manager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/settings/settings_manager.cpp b/common/settings/settings_manager.cpp index 269f70e67b..ebcfadba58 100644 --- a/common/settings/settings_manager.cpp +++ b/common/settings/settings_manager.cpp @@ -531,8 +531,8 @@ bool SETTINGS_MANAGER::MigrateIfNeeded() if( !m_migrateLibraryTables ) { COMMON_SETTINGS common; - wxString path = GetPathForSettingsFile( &common ); - common.LoadFromFile( path ); + wxString commonPath = GetPathForSettingsFile( &common ); + common.LoadFromFile( commonPath ); const std::vector libKeys = { wxT( "KICAD6_SYMBOL_DIR" ), @@ -550,7 +550,7 @@ bool SETTINGS_MANAGER::MigrateIfNeeded() for( const wxString& key : libKeys ) common.m_Env.vars.erase( key ); - common.SaveToFile( path ); + common.SaveToFile( commonPath ); } return true;