Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
No related merge requests found
...@@ -71,6 +71,8 @@ void MaemoRunControl::start() ...@@ -71,6 +71,8 @@ void MaemoRunControl::start()
{ {
if (!m_devConfig.isValid()) { if (!m_devConfig.isValid()) {
handleError(tr("No device configuration set for run configuration.")); handleError(tr("No device configuration set for run configuration."));
} else if (!m_runConfig) {
handleError(tr("Run configuration no longer available."));
} else { } else {
m_running = true; m_running = true;
emit started(); emit started();
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include <projectexplorer/runconfiguration.h> #include <projectexplorer/runconfiguration.h>
#include <QtCore/QPointer>
#include <QtCore/QString> #include <QtCore/QString>
namespace Qt4ProjectManager { namespace Qt4ProjectManager {
...@@ -71,7 +72,7 @@ private: ...@@ -71,7 +72,7 @@ private:
void setFinished(); void setFinished();
void handleError(const QString &errString); void handleError(const QString &errString);
MaemoRunConfiguration *m_runConfig; // TODO this pointer can be invalid QPointer<MaemoRunConfiguration> m_runConfig;
const MaemoDeviceConfig m_devConfig; const MaemoDeviceConfig m_devConfig;
MaemoSshRunner * const m_runner; MaemoSshRunner * const m_runner;
bool m_running; bool m_running;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment