Commit 4fde84c7 authored by Laurent Montel's avatar Laurent Montel 😁

Merge remote-tracking branch 'origin/Applications/17.04'

parents b83adaf8 a15ff1ba
......@@ -193,7 +193,6 @@ void ExportMailJob::slotWriteNextArchiveResource()
QTimer::singleShot(0, this, &ExportMailJob::slotMailsJobTerminated);
}
} else {
Q_EMIT info(i18n("Resources backup done."));
QTimer::singleShot(0, this, &ExportMailJob::slotCheckBackupResources);
}
}
......
......@@ -110,7 +110,7 @@ void ExportNotesJob::slotWriteNextArchiveResource()
const QString archivePath = Utils::notePath() + identifier + QDir::separator();
QString url = Utils::resourcePath(agent);
if (!mAgentPaths.contains(url)) {
if (!mAgentPaths.contains(url) && QDir(url).exists()) {
mAgentPaths << url;
if (!url.isEmpty()) {
ExportResourceArchiveJob *resourceJob = new ExportResourceArchiveJob(this);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment