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

Androdi: set m_isDeploying to false if deployment is cancelled

Browse Source 
If Android deploy dialog is cancelled, then "Run" is clicked again,
the deploy dialog will not show again. Instead, a build is started then
fail in deploying because no device was actually selected. This makes
sure d->m_isDeploying = false in BuildManager.

Change-Id: I8cb899fa57df30b3669e42d30d0f280f8f73fb38
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-02-20 15:34:06 +02:00
parent bad2d31747
commit 267cb34542
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/projectexplorer/buildmanager.cpp
View File

@@ -791,6 +791,7 @@ bool BuildManager::buildLists(const QList<BuildStepList *> bsls, const QStringLi
bool success = buildQueueAppend(steps, names, preambelMessage); bool success = buildQueueAppend(steps, names, preambelMessage);
if (!success) { if (!success) {
d->m_outputWindow->popup(IOutputPane::NoModeSwitch); d->m_outputWindow->popup(IOutputPane::NoModeSwitch);
d->m_isDeploying = false;
return false; return false;
} }