Cherry-pick upstream fix: Fix lockup when renaming a file from properties dialog
Aurélien COUDERC
3 years ago
| 0 | kio (5.78.0-4) UNRELEASED; urgency=medium | |
| 1 | ||
| 2 | [ Aurélien COUDERC ] | |
| 3 | * Cherry-pick upstream fix: | |
| 4 | - Fix lockup when renaming a file from properties dialog | |
| 5 | ||
| 6 | -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 07 Feb 2021 15:46:55 +0100 | |
| 7 | ||
| 0 | 8 | kio (5.78.0-3) unstable; urgency=medium |
| 1 | 9 | |
| 2 | 10 | * Remove graphviz from build depends. |
| 1 | 1 | fix_kfreebsd_build |
| 2 | 2 | fix_hurd_build.patch |
| 3 | 3 | #Use-CXX_FLAGS-for-moc_predefs.h.patch |
| 4 | upstream_5.79_0300441bb80c3d75a305bc7b1f4a7e1c36f28845_fix_lockup_when_renaming_a_file_from_properties_dialog.patch | |
| 4 | 5 | upstream-a183dd0d1ee0-copyjob-fix-crash-skip-retry.patch |
+40
-0
| 0 | Origin: https://invent.kde.org/frameworks/kio/commit/0300441bb80c3d75a305bc7b1f4a7e1c36f28845 | |
| 1 | From: David Redondo <kde@david-redondo.de> | |
| 2 | Date: Mon, 25 Jan 2021 12:26:29 +0100 | |
| 3 | Forwarded: not-needed | |
| 4 | Subject: [PATCH] Fix lockup when renaming a file from properties dialog | |
| 5 | 4c12899369f43009269d0fdb80964483365bb922 changed how we show the rename dialog. | |
| 6 | Before we would exec() it and now we call show(). This causes a lockup when | |
| 7 | renaming a file from the properties dialog to a filename that already exsist. | |
| 8 | Optimally we would change KPropertiesDialog to make it async and not use nested | |
| 9 | event loops but this fixes the lockup for now. | |
| 10 | . | |
| 11 | BUG:431902 | |
| 12 | --- | |
| 13 | src/widgets/kpropertiesdialog.cpp | 4 ++-- | |
| 14 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
| 15 | ||
| 16 | diff --git a/src/widgets/kpropertiesdialog.cpp b/src/widgets/kpropertiesdialog.cpp | |
| 17 | index 16e3cfaa..c49e89e3 100644 | |
| 18 | --- a/src/widgets/kpropertiesdialog.cpp | |
| 19 | +++ b/src/widgets/kpropertiesdialog.cpp | |
| 20 | @@ -1534,7 +1534,7 @@ void KFilePropsPlugin::applyChanges() | |
| 21 | } else { // Copying a template | |
| 22 | job = KIO::copyAs(oldurl, properties->url()); | |
| 23 | } | |
| 24 | - | |
| 25 | + KJobWidgets::setWindow(job, properties); | |
| 26 | connect(job, &KJob::result, | |
| 27 | this, &KFilePropsPlugin::slotCopyFinished); | |
| 28 | connect(job, &KIO::CopyJob::renamed, | |
| 29 | @@ -1543,7 +1543,7 @@ void KFilePropsPlugin::applyChanges() | |
| 30 | QEventLoop eventLoop; | |
| 31 | connect(this, &KFilePropsPlugin::leaveModality, | |
| 32 | &eventLoop, &QEventLoop::quit); | |
| 33 | - eventLoop.exec(QEventLoop::ExcludeUserInputEvents); | |
| 34 | + eventLoop.exec(); | |
| 35 | return; | |
| 36 | } | |
| 37 | properties->updateUrl(properties->url()); | |
| 38 | -- | |
| 39 | GitLab |