yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Do not resume paused transfer progress after dismissing cancel popup

Browse Source
This commit is contained in:
Michal Horejsek
2020-10-19 10:25:52 +02:00
parent 4893931a8d
commit cfd8e56277
3 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -7,6 +7,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
### Fixed ### Fixed
* GODT-749 Don't force PGP/Inline when sending plaintext messages. * GODT-749 Don't force PGP/Inline when sending plaintext messages.
* GODT-764 Fix deadlock in integration tests for Import-Export. * GODT-764 Fix deadlock in integration tests for Import-Export.
* GODT-662 Do not resume paused transfer progress after dismissing cancel popup.
### Changed ### Changed
* Bump crypto version to v0.0.0-20200818122824-ed5d25e28db8 * Bump crypto version to v0.0.0-20200818122824-ed5d25e28db8

1
internal/frontend/qml/ImportExportUI/DialogExport.qml
View File

@ -450,7 +450,6 @@ Dialog {
errorPopup.hide() errorPopup.hide()
} }
onClickedNo : { onClickedNo : {
go.resumeProcess()
errorPopup.hide() errorPopup.hide()
} }
} }

5
internal/frontend/qml/ImportExportUI/DialogImport.qml
View File

@ -796,11 +796,6 @@ Dialog {
errorPopup.hide() errorPopup.hide()
} }
onClickedNo : { onClickedNo : {
if (errorPopup.msgID == "ask_send_report") {
errorPopup.hide()
return
}
go.resumeProcess()
errorPopup.hide() errorPopup.hide()
} }