diff options
author | 2021-02-03 22:10:44 +0100 | |
---|---|---|
committer | 2021-02-03 23:33:46 +0100 | |
commit | ffb79726a4d361406005a2417a519ffb4c7e7030 (patch) | |
tree | 5dbd1650b7b0586eee30ffe5a2f3a907ca322e99 /kde-frameworks/kio/files | |
parent | sys-fs/mergerfs: 2.32.2 bump (diff) | |
download | gentoo-ffb79726a4d361406005a2417a519ffb4c7e7030.tar.gz gentoo-ffb79726a4d361406005a2417a519ffb4c7e7030.tar.bz2 gentoo-ffb79726a4d361406005a2417a519ffb4c7e7030.zip |
kde-frameworks/kio: CopyJob: fix crash with skip/retry
Upstream commit a183dd0d1ee0659e5341c7cb4117df27edd6f125
See also: https://mail.kde.org/pipermail/distributions/2021-February/000938.html
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=431731
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-frameworks/kio/files')
-rw-r--r-- | kde-frameworks/kio/files/kio-5.78.0-copyjob-crash.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/kde-frameworks/kio/files/kio-5.78.0-copyjob-crash.patch b/kde-frameworks/kio/files/kio-5.78.0-copyjob-crash.patch new file mode 100644 index 000000000000..a4b87821e203 --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.78.0-copyjob-crash.patch @@ -0,0 +1,32 @@ +From a183dd0d1ee0659e5341c7cb4117df27edd6f125 Mon Sep 17 00:00:00 2001 +From: Ahmad Samir <a.samirh78@gmail.com> +Date: Tue, 2 Feb 2021 11:31:40 +0200 +Subject: [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 +--- + src/core/copyjob.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/core/copyjob.cpp b/src/core/copyjob.cpp +index cee40a62..cb16010f 100644 +--- a/src/core/copyjob.cpp ++++ b/src/core/copyjob.cpp +@@ -1578,8 +1578,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{}); + }); +-- +GitLab + |