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

[Didier Roche-Tolomelli]

Only Cancel if there is anything to cancel

Only Cancel if there is anything to cancel

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:370
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/375/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/375

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/375/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

that makes sense, thanks Didier!

review: Approve

=== 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 @@
         function recheckForUpdate() {
             infoMessage = "";
             infoSecondaryMessage = "";
-            var msg = CancelUpdate();
+            var msg = ""
+            // Only  if there is anything to cancel:
+            if (updateBackend.currentUpdateState !== UbuntuUpdatePanel.NoUpdate && updateBackend.currentUpdateState !== UbuntuUpdatePanel.CheckingError)
+                CancelUpdate();
             if(msg) {
                 infoMessage = TranslateFromBackend(msg);
                 currentUpdateState = UbuntuUpdatePanel.CheckingError;