Merge lp:~didrocks/ubuntu-system-settings/no-update-ui-flickering into lp:ubuntu-system-settings

Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 370
Merged at revision: 370
Proposed branch: lp:~didrocks/ubuntu-system-settings/no-update-ui-flickering
Merge into: lp:ubuntu-system-settings
Diff against target: 15 lines (+4/-1)
1 file modified
plugins/system-update/PageComponent.qml (+4/-1)
To merge this branch: bzr merge lp:~didrocks/ubuntu-system-settings/no-update-ui-flickering
Reviewer Review Type Date Requested Status
Sebastien Bacher (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+187181@code.launchpad.net

Commit message

Only Cancel if there is anything to cancel

Description of the change

Only Cancel if there is anything to cancel

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :

that makes sense, thanks Didier!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml 2013-09-06 10:31:42 +0000
+++ plugins/system-update/PageComponent.qml 2013-09-24 10:07:54 +0000
@@ -54,7 +54,10 @@
54 function recheckForUpdate() {54 function recheckForUpdate() {
55 infoMessage = "";55 infoMessage = "";
56 infoSecondaryMessage = "";56 infoSecondaryMessage = "";
57 var msg = CancelUpdate();57 var msg = ""
58 // Only if there is anything to cancel:
59 if (updateBackend.currentUpdateState !== UbuntuUpdatePanel.NoUpdate && updateBackend.currentUpdateState !== UbuntuUpdatePanel.CheckingError)
60 CancelUpdate();
58 if(msg) {61 if(msg) {
59 infoMessage = TranslateFromBackend(msg);62 infoMessage = TranslateFromBackend(msg);
60 currentUpdateState = UbuntuUpdatePanel.CheckingError;63 currentUpdateState = UbuntuUpdatePanel.CheckingError;

Subscribers

People subscribed via source and target branches