diff --git a/Changelog.md b/Changelog.md index 4af09b42..a6738eaf 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/) ### Fixed * GODT-749 Don't force PGP/Inline when sending plaintext messages. * GODT-764 Fix deadlock in integration tests for Import-Export. +* GODT-662 Do not resume paused transfer progress after dismissing cancel popup. ### Changed * Bump crypto version to v0.0.0-20200818122824-ed5d25e28db8 diff --git a/internal/frontend/qml/ImportExportUI/DialogExport.qml b/internal/frontend/qml/ImportExportUI/DialogExport.qml index 6ffd196d..bee7ce41 100644 --- a/internal/frontend/qml/ImportExportUI/DialogExport.qml +++ b/internal/frontend/qml/ImportExportUI/DialogExport.qml @@ -450,7 +450,6 @@ Dialog { errorPopup.hide() } onClickedNo : { - go.resumeProcess() errorPopup.hide() } } diff --git a/internal/frontend/qml/ImportExportUI/DialogImport.qml b/internal/frontend/qml/ImportExportUI/DialogImport.qml index 18be24e5..7910db9d 100644 --- a/internal/frontend/qml/ImportExportUI/DialogImport.qml +++ b/internal/frontend/qml/ImportExportUI/DialogImport.qml @@ -796,11 +796,6 @@ Dialog { errorPopup.hide() } onClickedNo : { - if (errorPopup.msgID == "ask_send_report") { - errorPopup.hide() - return - } - go.resumeProcess() errorPopup.hide() }