Server-side file transfer UI, server notifies the recipient of a file transfer if the transfer is cancelled, fixed TextGetter not working on wrapped GUITextBlocks

2017-03-10 19:16:17 +02:00
parent 4f589603d1
commit a1342fdc45
4 changed files with 81 additions and 5 deletions
--- a/Subsurface/Source/GUI/GUITextBlock.cs
+++ b/Subsurface/Source/GUI/GUITextBlock.cs
@@ -259,7 +259,7 @@ namespace Barotrauma

            base.Draw(spriteBatch);

-            if (TextGetter != null) text = TextGetter();
+            if (TextGetter != null) Text = TextGetter();

            if (!string.IsNullOrEmpty(text))
            {