Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent errors when removing multiple nested dirs

This commit is contained in:
Martchus 2017-10-21 14:11:01 +02:00
parent 43b2f9ff22
commit bf2c446d20
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
widgets/misc/textviewdialog.cpp
View File

@ -110,12 +110,23 @@ TextViewDialog *TextViewDialog::forDirectoryErrors(const Data::SyncthingDir &dir
printDirectories(tr("Do you really want to remove the following directories:"), nonEmptyDirs), QMessageBox::YesToAll,
QMessageBox::NoToAll | QMessageBox::Default | QMessageBox::Escape)
== QMessageBox::YesToAll) {
QStringList removedDirs;
QStringList failedDirs;
for (const QString &dirPath : nonEmptyDirs) {
bool ok = false;
QDir dir(dirPath);
if (!dir.exists() || !dir.removeRecursively()) {
failedDirs << dirPath;
// check whether dir has already been removed by removing its parent
for (const QString &removedDir : removedDirs) {
if (dirPath.startsWith(removedDir)) {
ok = true;
break;
}
}
} else {
ok = true;
}
(ok ? removedDirs : failedDirs) << dirPath;
}
if (!failedDirs.isEmpty()) {
QMessageBox::critical(textViewDlg, title, printDirectories(tr("Unable to remove the following dirs:"), failedDirs));