summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2013-08-24 23:39:47 +0300
committerhjk <hjk121@nokiamail.com>2013-08-26 11:38:40 +0200
commitf5db35128bbad8640738f19616489f4518aec094 (patch)
treedff4a8486581ccc8b93d8f7039fc6c0cbf35d251
parent42cec4552b7a33b4e48f3448b10f5df7c05cee94 (diff)
downloadqt-creator-f5db35128bbad8640738f19616489f4518aec094.tar.gz
Fix crash when changing a kit in project settings
Change-Id: Ib584cb5d6d1d3802f3a21b741b560ace78722b9a Reviewed-by: hjk <hjk121@nokiamail.com>
-rw-r--r--src/plugins/projectexplorer/runconfiguration.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 0a055eab3f..c30c45ce79 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -182,7 +182,8 @@ void IRunConfigurationAspect::toMap(QVariantMap &map) const
IRunConfigurationAspect *IRunConfigurationAspect::clone(RunConfiguration *parent) const
{
IRunConfigurationAspect *other = create(parent);
- other->m_projectSettings = m_projectSettings->clone();
+ if (m_projectSettings)
+ other->m_projectSettings = m_projectSettings->clone();
other->m_globalSettings = m_globalSettings;
other->m_useGlobalSettings = m_useGlobalSettings;
return other;