Merge branch 'master' of https://gitlab.com/poe.regalis/barotrauma

# Conflicts: # Subsurface/Source/GameSession/GameSession.cs
2016-11-16 21:32:22 -03:00
parent fac0c850a5 1c206e1730
commit 7a33f5c120
12 changed files with 112 additions and 67 deletions
--- a/Subsurface/Source/GameSession/GameSession.cs
+++ b/Subsurface/Source/GameSession/GameSession.cs
@@ -362,6 +362,8 @@ namespace Barotrauma
        
        public void AddToGUIUpdateList()
        {
+            if (CrewManager != null) CrewManager.AddToGUIUpdateList();
+
            if (gameMode != null) gameMode.AddToGUIUpdateList();

            infoButton.AddToGUIUpdateList();