Merge lp:~abreu-alexandre/webbrowser-app/fix-filepicker-timer-accept into lp:webbrowser-app

Proposed by Alexandre Abreu on 2015-07-15
Status: Rejected
Rejected by: Olivier Tilloy on 2015-08-18
Proposed branch: lp:~abreu-alexandre/webbrowser-app/fix-filepicker-timer-accept
Merge into: lp:webbrowser-app
Diff against target: 11 lines (+1/-0)
1 file modified
src/app/ContentPickerDialog.qml (+1/-0)
To merge this branch: bzr merge lp:~abreu-alexandre/webbrowser-app/fix-filepicker-timer-accept
Reviewer Review Type Date Requested Status
Olivier Tilloy 2015-07-15 Disapprove on 2015-08-18
PS Jenkins bot continuous-integration Approve on 2015-08-03
Review via email: mp+264834@code.launchpad.net

Commit Message

Fix double accept() time issue that indeed causes races in the file processing

Description of the Change

Fix double accept() time issue that indeed causes races in the file processing

To post a comment you must log in.
Michael Sheldon (michael-sheldon) wrote :

It should be possible to remove the whole acceptTimer hack now and just accept the model when the status changes. We traced the underlying cause of this to the transfer dialog within the peer picker not getting destroyed correctly when its parent was destroyed, leaving the QML engine in an invalid state, this has since been fixed in content-hub.

Unmerged revisions

1096. By Alexandre Abreu on 2015-07-15

Fix double accept() time issue

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/ContentPickerDialog.qml'
2--- src/app/ContentPickerDialog.qml 2014-08-05 07:27:17 +0000
3+++ src/app/ContentPickerDialog.qml 2015-07-15 13:16:35 +0000
4@@ -94,6 +94,7 @@
5 if(Qt.application.active) {
6 webview.focus = true
7 model.accept(selectedItems)
8+ acceptTimer.stop()
9 }
10 }
11 }

Subscribers

People subscribed via source and target branches

to status/vote changes: