Fix manifest error handling

This corrects an extra argument in the error message and performs a
check to make sure the asynchronous operation is running. Some cases,
such as malformed XML file, can return immediately, leaving the
override cursor set and selection dialog disabled.

Change-Id: I6b9b95a9acc3a79bed6cca22d859832567819e44
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

1 files changed, 9 insertions, 5 deletions

diff --git a/src/plugins/winrt/winrtselectappdialog.cpp b/src/plugins/winrt/winrtselectappdialog.cpp
index d758832616..20de6a6951 100644
--- a/src/plugins/winrt/winrtselectappdialog.cpp
+++ b/src/plugins/winrt/winrtselectappdialog.cpp
@@ -158,8 +158,10 @@ void WinRtSelectAppDialog::addPackage()
     if (m_packageManager->startAddPackage(manifestFile,
                                           PackageManager::DevelopmentMode,
                                           &errorMessage)) {
-        QApplication::setOverrideCursor(Qt::BusyCursor);
-        setEnabled(false);
+        if (m_packageManager->operationInProgress()) {
+            QApplication::setOverrideCursor(Qt::BusyCursor);
+            setEnabled(false);
+        }
     } else {
         QMessageBox::warning(this, tr("Failed to Start Adding Package"),
                              errorMessage);
@@ -185,7 +187,7 @@ void WinRtSelectAppDialog::packageAddFailed(const QString &manifestFile, const Q
                                   prompt) == QMessageBox::Yes)
             PackageManager::launchDeveloperRegistration();
     } else {
-        QMessageBox::warning(this, tr("Package Registration Error").arg(manifestFile), message);
+        QMessageBox::warning(this, tr("Package Registration Error"), message);
     }
 }
 
@@ -216,8 +218,10 @@ void WinRtSelectAppDialog::contextMenuEvent(QContextMenuEvent *e)
             return;
         QString errorMessage;
         if (m_packageManager->startRemovePackage(package->fullName, &errorMessage)) {
-            QApplication::setOverrideCursor(Qt::BusyCursor);
-            setEnabled(false);
+            if (m_packageManager->operationInProgress()) {
+                QApplication::setOverrideCursor(Qt::BusyCursor);
+                setEnabled(false);
+            }
         } else {
             QMessageBox::warning(this, tr("Failed to Start Package Removal"),
                                  errorMessage);