From: Ahmad Samir <a.samirh78@gmail.com>
Date: Tue, 2 Feb 2021 09:31:40 +0000 (+0200)
Subject: [PATCH] CopyJob: fix crash with skip/retry
X-Git-Tag: archive/raspbian/5.97.0-1+rpi1~1^2^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e81dad37376ad15f219368869b52bc8d2a0b9047;p=kio.git

[PATCH] CopyJob: fix crash with skip/retry

The crash was happening because I was disconnecting the wrong signal in
the lambda connected to KIO::AskUserActionInterface::askUserSkipResult...

BUG: 431731
FIXED-IN: 5.79

Gbp-Pq: Name upstream-a183dd0d1ee0-copyjob-fix-crash-skip-retry.patch
---

diff --git a/src/core/copyjob.cpp b/src/core/copyjob.cpp
index 7e71e4b..b59fa4d 100644
--- a/src/core/copyjob.cpp
+++ b/src/core/copyjob.cpp
@@ -1581,8 +1581,8 @@ void CopyJobPrivate::slotResultErrorCopyingFiles(KJob *job)
             QObject::connect(askUserActionInterface, &KIO::AskUserActionInterface::askUserSkipResult,
                              q, [=](SkipDialog_Result result, KJob *parentJob) {
                 Q_ASSERT(parentJob == q);
-                // Only receive askUserRenameResult once per rename dialog
-                QObject::disconnect(askUserActionInterface, &KIO::AskUserActionInterface::askUserRenameResult,
+                // Only receive askUserSkipResult once per skip dialog
+                QObject::disconnect(askUserActionInterface, &KIO::AskUserActionInterface::askUserSkipResult,
                                     q, nullptr);
                 processFileRenameDialogResult(it, result, QUrl() /* no new url in skip */, QDateTime{});
             });