saberbud/zeal
1
0
Fork 0
mirror of https://github.com/zealdocs/zeal.git synced 2026-08-29 08:34:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

ui: Fix crash when encountering a corrupted docset directory (fixes #788)

Browse Source 
The crash occured in case destination directory for a docset being
installed already existed, but was not loaded into DocsetRegistry.
That usually happened due to previous failed attempt to install
a docset.
This commit is contained in:
Oleg Shparber
2017-10-21 22:19:45 +03:00
parent f17e1a1708
commit cf30c36392
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/ui/docsetsdialog.cpp
+14 -20
View File
@@ -689,39 +689,33 @@ void DocsetsDialog::removeDocset(const QString &name)
m_docsetsBeingDeleted.append(name);
Registry::Docset *docset = m_docsetRegistry->docset(name);
const QString title = docset->title();
const QString docsetPath = docset->path();
const QString docsetPath
= QDir(m_application->settings()->docsetPath).filePath(name + QLatin1String(".docset"));
const QString tmpPath = docsetPath + QLatin1String(".deleteme.")
+ QString::number(QDateTime::currentMSecsSinceEpoch());
// Remove from registry first to avoid renaming files in use on Windows.
m_docsetRegistry->remove(name);
if (m_docsetRegistry->contains(name)) {
m_docsetRegistry->remove(name);
}
// Rename first to allow simultaneous installation.
if (!QDir().rename(docsetPath, tmpPath)) {
const QString error = tr("Cannot delete docset <b>%1</b>! Please try closing other "
"applications first, as they may be accessing the docset "
"files.").arg(title);
const QString error = tr("Cannot remove directory <b>%1</b>! It might be in use"
"by another process.").arg(docsetPath);
QMessageBox::warning(this, QStringLiteral("Zeal"), error);
m_docsetsBeingDeleted.removeOne(name);
m_docsetRegistry->addDocset(docsetPath);
return;
}
QListWidgetItem *listItem = findDocsetListItem(name);
if (listItem) {
listItem->setHidden(false);
}
QFutureWatcher<bool> *watcher = new QFutureWatcher<bool>();
connect(watcher, &QFutureWatcher<void>::finished, [=] {
if (!watcher->result()) {
QMessageBox::warning(this, QStringLiteral("Zeal"),
tr("Cannot delete docset <b>%1</b>!").arg(title));
}
QListWidgetItem *listItem = findDocsetListItem(name);
if (listItem)
listItem->setHidden(false);
connect(watcher, &QFutureWatcher<bool>::finished, [=] {
// TODO: Log error if watcher->result() == false.
watcher->deleteLater();
m_docsetsBeingDeleted.removeOne(name);
});