Commit ab8970f0 authored by Christian Stenger's avatar Christian Stenger
Browse files

Fix issue with 'Run*'/'Stop' actions...



...when canceling the 'Save Changes' dialog. The test run was
canceled before the build, so the 'Run*' and 'Stop' actions stayed
in a wrong state forever.

Change-Id: I535c50a25c149da32123f832dc6575d1c0fe9643
Reviewed-by: default avatarNiels Weber <niels.weber@theqtcompany.com>
parent 166bf38a
...@@ -217,6 +217,13 @@ static void performTestRun(QFutureInterface<TestResult *> &futureInterface, ...@@ -217,6 +217,13 @@ static void performTestRun(QFutureInterface<TestResult *> &futureInterface,
void TestRunner::prepareToRunTests() void TestRunner::prepareToRunTests()
{ {
ProjectExplorer::Internal::ProjectExplorerSettings projectExplorerSettings =
ProjectExplorer::ProjectExplorerPlugin::projectExplorerSettings();
if (projectExplorerSettings.buildBeforeDeploy && !projectExplorerSettings.saveBeforeBuild) {
if (!ProjectExplorer::ProjectExplorerPlugin::saveModifiedFiles())
return;
}
const bool omitRunConfigWarnings = AutotestPlugin::instance()->settings()->omitRunConfigWarn; const bool omitRunConfigWarnings = AutotestPlugin::instance()->settings()->omitRunConfigWarn;
m_executingTests = true; m_executingTests = true;
...@@ -250,8 +257,6 @@ void TestRunner::prepareToRunTests() ...@@ -250,8 +257,6 @@ void TestRunner::prepareToRunTests()
return; return;
} }
ProjectExplorer::Internal::ProjectExplorerSettings projectExplorerSettings =
ProjectExplorer::ProjectExplorerPlugin::projectExplorerSettings();
if (!projectExplorerSettings.buildBeforeDeploy) { if (!projectExplorerSettings.buildBeforeDeploy) {
runTests(); runTests();
} else { } else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment