Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-10-01 02:30:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when deleting a file from the model (SpartanJ/ecode#270).

Browse Source
This commit is contained in:
Martín Lucas Golini
2024-04-23 16:20:53 -03:00
parent 3864e3aaef
commit d07598d535
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/eepp/ui/models/filesystemmodel.cpp
+15 -10
View File
@@ -676,6 +676,16 @@ bool FileSystemModel::handleFileEventLocked( const FileEvent& event ) {
return selectionIndex.internalData() == index.internalData() ||
( node->childCount() > 0 && nodeSelected->inParentTree( node ) );
} );
} );
beginDeleteRows( index.parent(), index.row(), index.row() );
eeDelete( parent->mChildren[index.row()] );
parent->mChildren.erase( parent->mChildren.begin() + index.row() );
endDeleteRows();
forEachView( [&]( UIAbstractView* view ) {
std::vector<ModelIndex> newIndexes;
view->getSelection().forEachIndex( [&]( const ModelIndex& selectedIndex ) {
if ( !selectedIndex.isValid() )
@@ -683,9 +693,11 @@ bool FileSystemModel::handleFileEventLocked( const FileEvent& event ) {
Node* curNode = static_cast<Node*>( selectedIndex.internalData() );
if ( curNode->getParent() == parent ) {
if ( selectedIndex.row() >= (Int64)pos ) {
newIndexes.emplace_back( this->index( selectedIndex.row() - 1,
selectedIndex.column(),
selectedIndex.parent() ) );
auto newIndex =
this->index( selectedIndex.row() - 1, selectedIndex.column(),
selectedIndex.parent() );
if ( newIndex.isValid() )
newIndexes.emplace_back( newIndex );
} else {
newIndexes.emplace_back( selectedIndex );
}
@@ -697,13 +709,6 @@ bool FileSystemModel::handleFileEventLocked( const FileEvent& event ) {
view->getSelection().set( newIndexes, false );
} );
beginDeleteRows( index.parent(), index.row(), index.row() );
eeDelete( parent->mChildren[index.row()] );
parent->mChildren.erase( parent->mChildren.begin() + index.row() );
endDeleteRows();
break;
}
case FileSystemEventType::Moved: {