Commit 563b8dc7 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Maemo: Don't try to re-run run control when run configuration is gone.

Quick fix for 2.1.
Proper fix is to copy all relevant information at run control creation time.

Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=203698
Reviewed-by: dt
parent ead5b067
......@@ -71,6 +71,8 @@ void MaemoRunControl::start()
{
if (!m_devConfig.isValid()) {
handleError(tr("No device configuration set for run configuration."));
} else if (!m_runConfig) {
handleError(tr("Run configuration no longer available."));
} else {
m_running = true;
emit started();
......
......@@ -39,6 +39,7 @@
#include <projectexplorer/runconfiguration.h>
#include <QtCore/QPointer>
#include <QtCore/QString>
namespace Qt4ProjectManager {
......@@ -71,7 +72,7 @@ private:
void setFinished();
void handleError(const QString &errString);
MaemoRunConfiguration *m_runConfig; // TODO this pointer can be invalid
QPointer<MaemoRunConfiguration> m_runConfig;
const MaemoDeviceConfig m_devConfig;
MaemoSshRunner * const m_runner;
bool m_running;
......
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