KiCad

Merge lp:~xzcvczx/kicad/instance-segfault into lp:kicad/product

  1. instance-segfault
  2. Merge into product
Proposed by xzcvczx
Status: Merged
Merged at revision: 6185
Proposed branch: lp:~xzcvczx/kicad/instance-segfault
Merge into: lp:kicad/product
Diff against target: 21 lines (+2/-2)
1 file modified
kicad/kicad.cpp (+2/-2)
To merge this branch: bzr merge lp:~xzcvczx/kicad/instance-segfault
Reviewer Review Type Date Requested Status
Wayne Stambaugh Approve
Nick Østergaard (community) Approve
Review via email: mp+270873@code.launchpad.net

Description of the change

moved m_bm.Init as it is not required for initPgm and it shouldn't run before initPgm has returned true

To post a comment you must log in.
Revision history for this message
Nick Østergaard (nickoe) wrote :

I have just tested this and this seems to fix the issue. This is currently be the last critical or high importance bug we have left.

review: Approve
Revision history for this message
Wayne Stambaugh (stambaughw) :
review: Approve
Revision history for this message
Wayne Stambaugh (stambaughw) wrote :

Merge request committed in branch r6185. Thank you for your contribution to kicad.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'kicad/kicad.cpp'
2--- kicad/kicad.cpp 2015-07-26 17:50:13 +0000
3+++ kicad/kicad.cpp 2015-09-11 22:44:01 +0000
4@@ -100,8 +100,6 @@
5 {
6 m_wx_app = aWxApp; // first thing.
7
8- m_bm.Init();
9-
10 wxString absoluteArgv0 = wxStandardPaths::Get().GetExecutablePath();
11
12 if( !wxIsAbsolutePath( absoluteArgv0 ) )
13@@ -117,6 +115,8 @@
14 if( !initPgm() )
15 return false;
16
17+ m_bm.Init();
18+
19 // Add search paths to feed the PGM_KICAD::SysSearch() function,
20 // currenly limited in support to only look for project templates
21 {