ScadaData: fix formatter

RapidScada · Mar 19, 2018 · 4069537 · 4069537
1 parent 49a867f
commit 4069537
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/ScadaData/ScadaData/Client/DataFormatter.cs b/ScadaData/ScadaData/Client/DataFormatter.cs
@@ -174,12 +174,13 @@ public void FormatCnlVal(double val, int stat, InCnlProps cnlProps, string decSe
 
                         // определение формата числа
                         NumberFormatInfo nfi;
+                        bool sepDefined = !(decSep == null && grSep == null);
 
-                        if (cnlPropsIsNull)
+                        if (cnlPropsIsNull || sepDefined)
                         {
-                            nfi = decSep == null && grSep == null ? 
-                                defNfi : 
-                                CreateFormatInfo(DefDecDig, decSep, grSep);
+                            nfi = sepDefined ? 
+                                CreateFormatInfo(DefDecDig, decSep, grSep) :
+                                defNfi;
                         }
                         else if (cnlProps.FormatInfo == null)
                         {