From f97d2932401c12880bad105805651b96a1735881 Mon Sep 17 00:00:00 2001
From: Unknown <dan@walms.co.uk>
Date: Fri, 18 May 2018 11:22:53 +0100
Subject: [PATCH] fix textblock and texstpresenter issues related to password
 char.

---
 src/Avalonia.Controls/Presenters/TextPresenter.cs | 4 ++--
 src/Avalonia.Controls/TextBlock.cs                | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Controls/Presenters/TextPresenter.cs b/src/Avalonia.Controls/Presenters/TextPresenter.cs
index c241466aea..bda660be51 100644
--- a/src/Avalonia.Controls/Presenters/TextPresenter.cs
+++ b/src/Avalonia.Controls/Presenters/TextPresenter.cs
@@ -223,11 +223,11 @@ namespace Avalonia.Controls.Presenters
 
             if (PasswordChar != default(char))
             {
-                result = base.CreateFormattedText(constraint, new string(PasswordChar, Text.Length));
+                result = base.CreateFormattedText(constraint, new string(PasswordChar, text?.Length ?? 0));
             }
             else
             {
-                result = base.CreateFormattedText(constraint, Text);
+                result = base.CreateFormattedText(constraint, text);
             }
 
             var selectionStart = SelectionStart;
diff --git a/src/Avalonia.Controls/TextBlock.cs b/src/Avalonia.Controls/TextBlock.cs
index 1fee309360..e7cf666589 100644
--- a/src/Avalonia.Controls/TextBlock.cs
+++ b/src/Avalonia.Controls/TextBlock.cs
@@ -111,6 +111,8 @@ namespace Avalonia.Controls
         /// </summary>
         public TextBlock()
         {
+            _text = string.Empty;
+
             Observable.Merge(
                 this.GetObservable(TextProperty).Select(_ => Unit.Default),
                 this.GetObservable(TextAlignmentProperty).Select(_ => Unit.Default),