Working on PPC

1 files changed, 19 insertions, 15 deletions

diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
index 941cb392a..1453a38a6 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchNumericTextBox.cs
@@ -121,18 +121,21 @@ namespace Tango.Touch.Controls
         {
             double value = (double)e;
 
-            if (!HasDecimalPoint)
+            if (_text_box != null) //Min and max not being set yet...
             {
-                value = Math.Round(value, 0);
-            }
+                if (!HasDecimalPoint)
+                {
+                    value = Math.Round(value, 0);
+                }
 
-            if (value < Minimum)
-            {
-                value = Minimum;
-            }
-            else if (value > Maximum)
-            {
-                value = Maximum;
+                if (value < Minimum)
+                {
+                    value = Minimum;
+                }
+                else if (value > Maximum)
+                {
+                    value = Maximum;
+                }
             }
 
             return value;
@@ -168,17 +171,18 @@ namespace Tango.Touch.Controls
                 if (StringFormat != null)
                 {
                     _text_block.Text = Value.ToString(StringFormat);
+                    _text_box.Text = Value.ToString(StringFormat);
                 }
                 else
                 {
                     _text_block.Text = Value.ToString();
                 }
-            }
 
-            BindingExpression b = GetBindingExpression(ValueProperty);
-            if (b != null)
-            {
-                b.UpdateSource();
+                BindingExpression b = GetBindingExpression(ValueProperty);
+                if (b != null)
+                {
+                    b.UpdateSource();
+                }
             }
         }