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

2016-11-16 17:37:43 +02:00
parent 5b99f9e35e 5922fc972d
commit f8d2bb4e2a
39 changed files with 441 additions and 47 deletions
--- a/Subsurface/Source/Networking/GameServer.cs
+++ b/Subsurface/Source/Networking/GameServer.cs
@@ -288,6 +288,14 @@ namespace Barotrauma.Networking
            Log("Master server responded", Color.Cyan);
        }
        
+        public override void AddToGUIUpdateList()
+        {
+            if (started) base.AddToGUIUpdateList();
+
+            if (settingsFrame != null) settingsFrame.AddToGUIUpdateList();
+            if (log.LogFrame != null) log.LogFrame.AddToGUIUpdateList();
+        }
+
        public override void Update(float deltaTime)
        {
            if (ShowNetStats) netStats.Update(deltaTime);