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

Fix crash deleting project tree items 

Fixes sentry KICAD-C2


(cherry picked from commit 7d25b6de87)
This commit is contained in:
Marek Roszko 2023-02-19 10:08:49 -05:00 committed by Mark Roszko
parent 6b38927123
commit 187947e8d8
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kicad/project_tree_pane.cpp
View File

@ -946,7 +946,16 @@ std::vector<PROJECT_TREE_ITEM*> PROJECT_TREE_PANE::GetSelectedData()
m_TreeProject->GetSelections( selection );
for( auto it = selection.begin(); it != selection.end(); it++ )
data.push_back( GetItemIdData( *it ) );
{
PROJECT_TREE_ITEM* item = GetItemIdData( *it );
if( !item )
{
wxLogDebug( "Null tree item returned for selection, dynamic_cast failed?" );
continue;
}
data.push_back( item );
}
return data;
}
@ -1107,7 +1116,7 @@ void PROJECT_TREE_PANE::onFileSystemEvent( wxFileSystemWatcherEvent& event )
// of the event, even though the file isn't there anymore.
PROJECT_TREE_ITEM* rootData = GetItemIdData( root_id );
if( newpath.Exists() && ( newfn != rootData->GetFileName() ) )
if( rootData && newpath.Exists() && ( newfn != rootData->GetFileName() ) )
{
wxTreeItemId newroot_id = findSubdirTreeItem( newdir );
wxTreeItemId newitem = addItemToProjectTree( newfn, newroot_id, nullptr, true );