Commit 141f53cf authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Run/Debug: Do not launch on a library project if user cancels

the executable dialog that pops up.

Reviewed-by: dt
parent a10e3a04
...@@ -237,6 +237,15 @@ void DebuggerRunControl::setCustomEnvironment(Utils::Environment env) ...@@ -237,6 +237,15 @@ void DebuggerRunControl::setCustomEnvironment(Utils::Environment env)
void DebuggerRunControl::start() void DebuggerRunControl::start()
{ {
QTC_ASSERT(d->m_engine, return); QTC_ASSERT(d->m_engine, return);
// User canceled input dialog asking for executable when working on library project.
if (d->m_engine->startParameters().startMode == StartInternal
&& d->m_engine->startParameters().executable.isEmpty()) {
appendMessage(tr("No executable specified.\n"), ErrorMessageFormat);
emit started();
emit finished();
return;
}
debuggerCore()->runControlStarted(d->m_engine); debuggerCore()->runControlStarted(d->m_engine);
// We might get a synchronous startFailed() notification on Windows, // We might get a synchronous startFailed() notification on Windows,
......
...@@ -103,11 +103,15 @@ LocalApplicationRunControl::~LocalApplicationRunControl() ...@@ -103,11 +103,15 @@ LocalApplicationRunControl::~LocalApplicationRunControl()
void LocalApplicationRunControl::start() void LocalApplicationRunControl::start()
{ {
m_applicationLauncher.start(m_runMode, m_executable, m_commandLineArguments);
emit started(); emit started();
if (m_executable.isEmpty()) {
QString msg = tr("Starting %1...\n").arg(QDir::toNativeSeparators(m_executable)); appendMessage(tr("No executable specified.\n"), ErrorMessageFormat);
appendMessage(msg, NormalMessageFormat); emit finished();
} else {
m_applicationLauncher.start(m_runMode, m_executable, m_commandLineArguments);
QString msg = tr("Starting %1...\n").arg(QDir::toNativeSeparators(m_executable));
appendMessage(msg, NormalMessageFormat);
}
} }
LocalApplicationRunControl::StopResult LocalApplicationRunControl::stop() LocalApplicationRunControl::StopResult LocalApplicationRunControl::stop()
......
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