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

Attempt to fix Coverity issue 305290.

This commit is contained in:
Wayne Stambaugh 2021-02-24 14:32:34 -05:00
parent 0bab025832
commit 50712f7280
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/settings/common_settings.cpp
View File

@ -46,12 +46,14 @@ COMMON_SETTINGS::COMMON_SETTINGS() :
m_Input(), m_Input(),
m_Graphics(), m_Graphics(),
m_Session(), m_Session(),
m_System() m_System(),
m_NetclassPanel()
{ {
// This only effect the first time KiCad is run. The user's setting will be used for all // This only effect the first time KiCad is run. The user's setting will be used for all
// subsequent runs. // subsequent runs.
// Menu icons are off by default on OSX and on for all other platforms. // Menu icons are off by default on OSX and on for all other platforms.
// Use automatic canvas scaling on OSX, but not on the other platforms (their detection isn't as good). // Use automatic canvas scaling on OSX, but not on the other platforms (their detection
// isn't as good).
#if defined( __WXMAC__ ) #if defined( __WXMAC__ )
bool defaultUseIconsInMenus = false; bool defaultUseIconsInMenus = false;
double canvasScale = 0.0; double canvasScale = 0.0;
@ -267,8 +269,9 @@ bool COMMON_SETTINGS::MigrateFromLegacy( wxConfigBase* aCfg )
ret &= fromLegacy<int>( aCfg, "IconScale", "appearance.icon_scale" ); ret &= fromLegacy<int>( aCfg, "IconScale", "appearance.icon_scale" );
ret &= fromLegacy<bool>( aCfg, "UseIconsInMenus", "appearance.use_icons_in_menus" ); ret &= fromLegacy<bool>( aCfg, "UseIconsInMenus", "appearance.use_icons_in_menus" );
// Force OSX to automatically scale the canvas. Before v6, the user setting wasn't used on OSX and was // Force OSX to automatically scale the canvas. Before v6, the user setting wasn't used on OSX
// set to 1.0. In v6, the setting is now used by OSX and should default to automatic scaling. // and was set to 1.0. In v6, the setting is now used by OSX and should default to automatic
// scaling.
#ifdef __WXMAC__ #ifdef __WXMAC__
( *this )[PointerFromString( "appearance.canvas_scale" )] = 0.0; ( *this )[PointerFromString( "appearance.canvas_scale" )] = 0.0;
#endif #endif