Merge remote-tracking branch 'origin/master' into wip/clangwip/clang

Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f

1 files changed, 22 insertions, 2 deletions

diff --git a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
index 37d8a199e2..8585cec354 100644
--- a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
+++ b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
@@ -143,9 +143,24 @@ void BlackBerryDebugTokenRequestDialog::requestDebugToken()
 
     BlackBerryConfigurationManager &configuration = BlackBerryConfigurationManager::instance();
 
+    bool ok;
+    const QString cskPassword = m_utils.cskPassword(this, &ok);
+
+    if (!ok) {
+        setBusy(false);
+        return;
+    }
+
+    const QString certificatePassword = m_utils.certificatePassword(this, &ok);
+
+    if (!ok) {
+        setBusy(false);
+        return;
+    }
+
     m_requester->requestDebugToken(m_ui->debugTokenPath->path(),
-            m_utils.cskPassword(), configuration.defaultKeystorePath(),
-            m_utils.certificatePassword(), m_ui->devicePin->text());
+            cskPassword, configuration.defaultKeystorePath(),
+            certificatePassword, m_ui->devicePin->text());
 }
 
 void BlackBerryDebugTokenRequestDialog::setDefaultPath()
@@ -235,6 +250,11 @@ void BlackBerryDebugTokenRequestDialog::debugTokenArrived(int status)
         break;
     }
 
+    QFile file(m_ui->debugTokenPath->path());
+
+    if (file.exists())
+        file.remove();
+
     QMessageBox::critical(this, tr("Error"), errorString);
 
     setBusy(false);