feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Do check for valid device confuguration earlier.

Browse Source
This commit is contained in:
ck
2010-04-14 15:47:07 +02:00
parent 5df34cad07
commit 7289fbfe90
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
View File

@@ -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();