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

Don't split legacy paths 

The '.' is a valid character in the legacy preferences, not a separator.
Also adds fail-safe catch for JSON throws

Fixes https://gitlab.com/kicad/code/kicad/issues/10211

(cherry picked from commit a326d777f0)
This commit is contained in:
Seth Hillbrand 2022-01-03 10:05:45 -08:00
parent de39bffd90
commit dda569d486
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
eeschema/eeschema_settings.cpp
View File

@ -549,7 +549,15 @@ bool EESCHEMA_SETTINGS::MigrateFromLegacy( wxConfigBase* aCfg )
if( aCfg->Read( key, &value ) )
{
std::string key_utf( key.ToUTF8() );
js[JSON_SETTINGS_INTERNALS::PointerFromString( key_utf )] = value;
try
{
js[key_utf] = value;
}
catch(...)
{
continue;
}
}
}
@ -562,7 +570,15 @@ bool EESCHEMA_SETTINGS::MigrateFromLegacy( wxConfigBase* aCfg )
if( aCfg->Read( key, &value ) )
{
std::string key_utf( key.ToUTF8() );
js[JSON_SETTINGS_INTERNALS::PointerFromString( key_utf )] = value;
try
{
js[key_utf] = value;
}
catch(...)
{
continue;
}
}
}