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

Fix compile issue on Linux & crash issue on Windows. 

Fixes https://gitlab.com/kicad/code/kicad/issues/3937
This commit is contained in:
Jeff Young 2020-02-25 12:27:23 +00:00
parent cdad62022b
commit 4b380f0dc3
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcbnew/drc/drc_tree_model.h
View File

@ -240,7 +240,7 @@ public:
// display data, but Windows will create multiple associations. // display data, but Windows will create multiple associations.
// On MacOS, this crashes kicad. See https://gitlab.com/kicad/code/kicad/issues/3666 // On MacOS, this crashes kicad. See https://gitlab.com/kicad/code/kicad/issues/3666
// and https://gitlab.com/kicad/code/kicad/issues/3653 // and https://gitlab.com/kicad/code/kicad/issues/3653
AttachTo( m_markerDataView ); AttachTo( m_view );
#endif #endif
} }
@ -279,7 +279,10 @@ public:
bool IsContainer( wxDataViewItem const& aItem ) const override bool IsContainer( wxDataViewItem const& aItem ) const override
{ {
return ToNode( aItem )->m_Type == DRC_TREE_NODE::MARKER; if( ToNode( aItem ) == nullptr ) // must be tree root...
return true;
else
return ToNode( aItem )->m_Type == DRC_TREE_NODE::MARKER;
} }
wxDataViewItem GetParent( wxDataViewItem const& aItem ) const override wxDataViewItem GetParent( wxDataViewItem const& aItem ) const override