From c4aa9095f2f467d1565e3ec6b9fbe25e1600efe5 Mon Sep 17 00:00:00 2001
From: Morten Christensen <unknown@kiln.example.com>
Date: Wed, 13 Mar 2013 20:24:21 -0100
Subject: [PATCH] Fixes U4-1858 by ensuring that the text field is reset before
 setting or removing a value

---
 .../numberfield/numberField.cs                  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/umbraco.editorControls/numberfield/numberField.cs b/src/umbraco.editorControls/numberfield/numberField.cs
index f5552e62ec..2b3a4178d6 100644
--- a/src/umbraco.editorControls/numberfield/numberField.cs
+++ b/src/umbraco.editorControls/numberfield/numberField.cs
@@ -68,17 +68,18 @@ namespace umbraco.editorControls
         /// </summary>
         public override string Text
         {
-            get
-            {
-                return base.Text;
-            }           
+            get { return base.Text; }
             set
             {
-                int integer;
-                
-                if (int.TryParse(value, NumberStyles.AllowThousands, CultureInfo.InvariantCulture, out integer))
+                if (value != null)
                 {
-                    base.Text = integer.ToString();
+                    base.Text = "";//Resets the text-field in case the value is removed
+
+                    int integer;//The value will only be parsed if it contains a valid value
+                    if (int.TryParse(value, NumberStyles.AllowThousands, CultureInfo.InvariantCulture, out integer))
+                    {
+                        base.Text = integer.ToString(CultureInfo.InvariantCulture);
+                    }
                 }
             }
         }