Browse Source

fix crash in wxDataViewItem GetNextItem() when there are no item.

Fixes #9540
https://gitlab.com/kicad/code/kicad/issues/9540
6.0.7
jean-pierre charras 4 years ago
parent
commit
4293caf00c
  1. 13
      common/wxdataviewctrl_helpers.cpp

13
common/wxdataviewctrl_helpers.cpp

@ -42,20 +42,29 @@ wxDataViewItem GetPrevItem( wxDataViewCtrl const& aView, wxDataViewItem const& a
wxDataViewItem GetNextItem( wxDataViewCtrl const& aView, wxDataViewItem const& aItem )
{
wxDataViewItem nextItem;
wxDataViewItem invalid;
if( !aItem.IsOk() )
{
// No selection. Select the first.
wxDataViewItemArray children;
aView.GetModel()->GetChildren( aItem, children );
return children[0];
if( children.size() )
return children[0];
return invalid;
}
if( aView.IsExpanded( aItem ) )
{
wxDataViewItemArray children;
aView.GetModel()->GetChildren( aItem, children );
nextItem = children[0];
if( children.size() )
return children[0];
return invalid;
}
else
{

Loading…
Cancel
Save