From 7289fbfe90b0a41addf9b3fde244106741b5528d Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Wed, 14 Apr 2010 15:47:07 +0200
Subject: [PATCH] Maemo: Do check for valid device confuguration earlier.
---
.../qt-maemo/maemoruncontrol.cpp | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
index 0e75d1b6def..be974f539af 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
@@ -71,12 +71,16 @@ AbstractMaemoRunControl::~AbstractMaemoRunControl()
void AbstractMaemoRunControl::start()
{
m_stoppedByUser = false;
- emit started();
- startInitialCleanup();
+ if (!m_devConfig.isValid()) {
+ handleError(tr("No device configuration set for run configuration."));
+ } else {
+ emit started();
+ startInitialCleanup();
+ }
}
void AbstractMaemoRunControl::startInitialCleanup()
-{
+{
emit addToOutputWindow(this, tr("Cleaning up remote leftovers first ..."));
const QStringList appsToKill
= QStringList() << executableFileName() << QLatin1String("gdbserver");
@@ -113,10 +117,7 @@ void AbstractMaemoRunControl::startDeployment(bool forDebugging)
{
QTC_ASSERT(m_runConfig, return);
- if (!m_devConfig.isValid()) {
- handleError(tr("No device configuration set for run configuration."));
- emit finished();
- } else if (m_stoppedByUser) {
+ if (m_stoppedByUser) {
emit finished();
} else {
m_deployables.clear();
--
GitLab