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

KiCad: fix segfault when cancelling when another instance is already running. (fixes lp:1494616) 

* Do not initialize BIN_MOD until after program initialiaztion returns true.
This commit is contained in:
Simon Wells 2015-09-12 11:06:37 -04:00 committed by Wayne Stambaugh
parent f3a142b03c 906991c4ac
commit 3076a5deda
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kicad/kicad.cpp
View File

@ -100,8 +100,6 @@ bool PGM_KICAD::OnPgmInit( wxApp* aWxApp )
{ {
m_wx_app = aWxApp; // first thing. m_wx_app = aWxApp; // first thing.
m_bm.Init();
wxString absoluteArgv0 = wxStandardPaths::Get().GetExecutablePath(); wxString absoluteArgv0 = wxStandardPaths::Get().GetExecutablePath();
if( !wxIsAbsolutePath( absoluteArgv0 ) ) if( !wxIsAbsolutePath( absoluteArgv0 ) )
@ -117,6 +115,8 @@ bool PGM_KICAD::OnPgmInit( wxApp* aWxApp )
if( !initPgm() ) if( !initPgm() )
return false; return false;
m_bm.Init();
// Add search paths to feed the PGM_KICAD::SysSearch() function, // Add search paths to feed the PGM_KICAD::SysSearch() function,
// currenly limited in support to only look for project templates // currenly limited in support to only look for project templates
{ {