realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make sure selected item is still valid before activating (KICAD-18S).

Browse Source
This commit is contained in:
Jeff Young 2025-07-14 22:46:35 +01:00
parent a3bf095387
commit dc4f639c61
3 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kicad/project_tree.cpp
View File

@ -208,6 +208,20 @@ void PROJECT_TREE::LoadIcons()
} }
void PROJECT_TREE::GetItemsRecursively( const wxTreeItemId& aParentId, std::vector<wxTreeItemId>& aItems )
{
wxTreeItemIdValue cookie;
wxTreeItemId child = GetFirstChild( aParentId, cookie );
while( child.IsOk() )
{
aItems.push_back( child );
GetItemsRecursively( child, aItems );
child = GetNextChild( aParentId, cookie );
}
}
int PROJECT_TREE::OnCompareItems( const wxTreeItemId& item1, const wxTreeItemId& item2 ) int PROJECT_TREE::OnCompareItems( const wxTreeItemId& item1, const wxTreeItemId& item2 )
{ {
PROJECT_TREE_ITEM* myitem1 = (PROJECT_TREE_ITEM*) GetItemData( item1 ); PROJECT_TREE_ITEM* myitem1 = (PROJECT_TREE_ITEM*) GetItemData( item1 );

2
kicad/project_tree.h
View File

@ -57,6 +57,8 @@ public:
void LoadIcons(); void LoadIcons();
void GetItemsRecursively( const wxTreeItemId& aParentId, std::vector<wxTreeItemId>& aItems );
void SetGitRepo( git_repository* aRepo ) { m_gitCommon->SetRepo( aRepo ); } void SetGitRepo( git_repository* aRepo ) { m_gitCommon->SetRepo( aRepo ); }
git_repository* GetGitRepo() const { return m_gitCommon->GetRepo(); } git_repository* GetGitRepo() const { return m_gitCommon->GetRepo(); }

30
kicad/project_tree_pane.cpp
View File

@ -1177,12 +1177,23 @@ void PROJECT_TREE_PANE::onIdle( wxIdleEvent& aEvent )
if( m_selectedItem != nullptr ) if( m_selectedItem != nullptr )
{ {
// Activate launches a window which may run the event loop on top of us and cause OnIdle // Make sure m_selectedItem still exists in the tree before activating it.
// to get called again, so be sure to block off the activation condition first. std::vector<wxTreeItemId> validItemIds;
PROJECT_TREE_ITEM* item = m_selectedItem; m_TreeProject->GetItemsRecursively( m_TreeProject->GetRootItem(), validItemIds );
m_selectedItem = nullptr;
item->Activate( this ); for( wxTreeItemId id : validItemIds )
{
if( GetItemIdData( id ) == m_selectedItem )
{
// Activate launches a window which may run the event loop on top of us and cause
// onIdle to get called again, so be sure to null out m_selectedItem first.
PROJECT_TREE_ITEM* item = m_selectedItem;
m_selectedItem = nullptr;
item->Activate( this );
break;
}
}
} }
} }
@ -1254,19 +1265,18 @@ void PROJECT_TREE_PANE::onExpand( wxTreeEvent& Event )
std::vector<PROJECT_TREE_ITEM*> PROJECT_TREE_PANE::GetSelectedData() std::vector<PROJECT_TREE_ITEM*> PROJECT_TREE_PANE::GetSelectedData()
{ {
wxArrayTreeItemIds selection; wxArrayTreeItemIds selection;
std::vector<PROJECT_TREE_ITEM*> data; std::vector<PROJECT_TREE_ITEM*> data;
m_TreeProject->GetSelections( selection ); m_TreeProject->GetSelections( selection );
for( auto it = selection.begin(); it != selection.end(); it++ ) for( const wxTreeItemId itemId : selection )
{ {
PROJECT_TREE_ITEM* item = GetItemIdData( *it ); PROJECT_TREE_ITEM* item = GetItemIdData( itemId );
if( !item ) if( !item )
{ {
wxLogTrace( traceGit, wxS( "Null tree item returned for selection, dynamic_cast " wxLogTrace( traceGit, wxS( "Null tree item returned for selection, dynamic_cast failed?" ) );
"failed?" ) );
continue; continue;
} }