summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElvis Angelaccio <elvis.angelaccio@kde.org>2016-10-05 09:04:48 (GMT)
committerElvis Angelaccio <elvis.angelaccio@kde.org>2016-10-05 09:08:46 (GMT)
commit6db65d75fa5c1a394f72a752990e77918775896b (patch)
treead56bc139824f3e0e9053f7a68f9e6615f299933
parent60ea7b393ed96fea5c6bed2fceb568eee3291105 (diff)
BacthExtractJob: fix forwarding of errors
Now ark shows again the error dialog when a wrong password is provided upon batch-extracting header-encrypted archives. Task: 1877
-rw-r--r--kerfuffle/jobs.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/kerfuffle/jobs.cpp b/kerfuffle/jobs.cpp
index 75bac3d..caaed8d 100644
--- a/kerfuffle/jobs.cpp
+++ b/kerfuffle/jobs.cpp
@@ -343,7 +343,7 @@ void BatchExtractJob::doWork()
{
connect(m_loadJob, &KJob::result, this, &BatchExtractJob::slotLoadingFinished);
- // Forward signals
+ // Forward LoadJob's signals.
connect(m_loadJob, &Kerfuffle::Job::newEntry, this, &BatchExtractJob::newEntry);
connect(m_loadJob, &Kerfuffle::Job::userQuery, this, &BatchExtractJob::userQuery);
m_loadJob->start();
@@ -352,7 +352,9 @@ void BatchExtractJob::doWork()
void BatchExtractJob::slotLoadingFinished(KJob *job)
{
if (job->error()) {
- emitResult();
+ // Forward errors as well.
+ onError(job->errorString(), QString());
+ onFinished(false);
return;
}