From 878429ad24b4400dfd56b6acfc8130a46d68e132 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Thu, 23 Jun 2011 16:13:42 +0200
Subject: [PATCH] Remote Linux: Fix possible crash.
Change-Id: I1519117381dbeb22d40546ecf8467079ca85aa35
Reviewed-on: http://codereview.qt.nokia.com/677
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
---
src/plugins/remotelinux/maemodeployables.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/plugins/remotelinux/maemodeployables.cpp b/src/plugins/remotelinux/maemodeployables.cpp
index 4984fa43a59..a270c31f896 100644
--- a/src/plugins/remotelinux/maemodeployables.cpp
+++ b/src/plugins/remotelinux/maemodeployables.cpp
@@ -64,8 +64,7 @@ void MaemoDeployables::init()
// TODO do we want to disable the view
- if (!m_target->qt4Project()->rootProjectNode()->parseInProgress())
- createModels();
+ createModels();
}
void MaemoDeployables::startTimer(Qt4ProjectManager::Qt4ProFileNode*, bool success, bool parseInProgress)
@@ -81,7 +80,7 @@ void MaemoDeployables::createModels()
return;
const Qt4ProFileNode *const rootNode
= m_target->qt4Project()->rootProjectNode();
- if (!rootNode) // Happens on project creation by wizard.
+ if (!rootNode || rootNode->parseInProgress()) // Can be null right after project creation by wizard.
return;
m_updateTimer->stop();
disconnect(m_target->qt4Project(),
--
GitLab