feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

MiniProjectTargetSelector: Allow for startupProject to be nullptr

Browse Source 
This should not happen, but currently it does during session loading.

Change-Id: Ic4da775010c8d947e8db210f618519080068e14a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-10-04 14:59:55 +02:00
parent 9089b3acbd
commit 56086d6bb5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/projectexplorer/miniprojecttargetselector.cpp
View File

@@ -1120,7 +1120,7 @@ bool MiniProjectTargetSelector::addedDeployConfiguration(DeployConfiguration *dc
bool MiniProjectTargetSelector::removedDeployConfiguration(DeployConfiguration *dc) bool MiniProjectTargetSelector::removedDeployConfiguration(DeployConfiguration *dc)
{ {
if (dc->target() != m_project->activeTarget()) if (!m_project || dc->target() != m_project->activeTarget())
return false; return false;
m_listWidgets[DEPLOY]->removeProjectConfiguration(dc); m_listWidgets[DEPLOY]->removeProjectConfiguration(dc);
@@ -1128,7 +1128,7 @@ bool MiniProjectTargetSelector::removedDeployConfiguration(DeployConfiguration *
} }
bool MiniProjectTargetSelector::addedRunConfiguration(RunConfiguration *rc) bool MiniProjectTargetSelector::addedRunConfiguration(RunConfiguration *rc)
{ {
if (rc->target() != m_project->activeTarget()) if (!m_project || rc->target() != m_project->activeTarget())
return false; return false;
m_listWidgets[RUN]->addProjectConfiguration(rc); m_listWidgets[RUN]->addProjectConfiguration(rc);
@@ -1137,7 +1137,7 @@ bool MiniProjectTargetSelector::addedRunConfiguration(RunConfiguration *rc)
bool MiniProjectTargetSelector::removedRunConfiguration(RunConfiguration *rc) bool MiniProjectTargetSelector::removedRunConfiguration(RunConfiguration *rc)
{ {
if (rc->target() != m_project->activeTarget()) if (!m_project || rc->target() != m_project->activeTarget())
return false; return false;
m_listWidgets[RUN]->removeProjectConfiguration(rc); m_listWidgets[RUN]->removeProjectConfiguration(rc);