Fix up setting containments and teams in TeamMember

1 files changed, 9 insertions, 9 deletions

diff --git a/sigencore/TeamMember.cpp b/sigencore/TeamMember.cpp
index 663645ba..9ddb96cd 100644
--- a/sigencore/TeamMember.cpp
+++ b/sigencore/TeamMember.cpp
@@ -119,20 +119,20 @@ bool TeamMember::setContainment(Containment* containment)
 {
     Team* team = qobject_cast<Team*>(containment);
     if (team)
-        setTeam(team);
-    m_containment->removeMember(this);
+        return setTeam(team);
+    if (m_containment && !m_containment->removeMember(this))
+        return false;
     m_containment = containment;
+    return true;
 }
 
 bool TeamMember::setTeam(Team* team)
 {
-    if (m_team && m_team->removeTeamMember(this))
-    {
-        m_team = team;
-        m_containment = team;
-        return true;
-    }
-    return false;
+    if (m_team && !m_team->removeTeamMember(this))
+        return false;
+    m_team = team;
+    m_containment = team;
+    return true;
 }
 
 Team* TeamMember::team() const