nosignal/nosignal-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

plugin/fsm: fix crash

Browse source 
Don't capture entries cause entries may be destroyed before async callback
This commit is contained in:
2 * r + 2 * t 2025-09-21 23:25:55 +10:00
parent 7b914f1faa
commit d89dc8f318
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugin/src/Caelestia/Models/filesystemmodel.cpp
View file

@ -276,9 +276,13 @@ void FileSystemModel::updateEntriesForDir(const QString& dir) {
const auto showHidden = m_showHidden; const auto showHidden = m_showHidden;
const auto filter = m_filter; const auto filter = m_filter;
const auto nameFilters = m_nameFilters; const auto nameFilters = m_nameFilters;
const auto oldEntries = m_entries;
const auto baseDir = m_dir; const auto baseDir = m_dir;
QSet<QString> oldPaths;
for (const auto& entry : m_entries) {
oldPaths << entry->path();
}
const auto future = QtConcurrent::run([=](QPromise<QPair<QSet<QString>, QSet<QString>>>& promise) { const auto future = QtConcurrent::run([=](QPromise<QPair<QSet<QString>, QSet<QString>>>& promise) {
const auto flags = recursive ? QDirIterator::Subdirectories : QDirIterator::NoIteratorFlags; const auto flags = recursive ? QDirIterator::Subdirectories : QDirIterator::NoIteratorFlags;
@ -336,11 +340,6 @@ void FileSystemModel::updateEntriesForDir(const QString& dir) {
newPaths.insert(path); newPaths.insert(path);
} }
QSet<QString> oldPaths;
for (const auto& entry : oldEntries) {
oldPaths.insert(entry->path());
}
if (promise.isCanceled() || newPaths == oldPaths) { if (promise.isCanceled() || newPaths == oldPaths) {
return; return;
} }