Merge branch '1.2.2_BRANCH' into develop

# Conflicts: # Libs/CMS_CORE_Library.dll
2019-07-30 11:09:43 +02:00
parent 1364371252 7a351072b2
commit ffa880adfb
24 changed files with 6264 additions and 425 deletions
@@ -173,7 +173,7 @@ namespace Step.Config
            }
        }

-        public static bool CheckAreaStatus(string areaName)
+        public static bool CheckAreaStatus(string areaName) 
        {   // Get Area status ( enabled field) by name
            switch (areaName)
            {
@@ -211,7 +211,7 @@ namespace Step.Config
        }

        private static void ReadScadaFile()
-        {
+        { 
            DirectoryInfo d = new DirectoryInfo(SCADA_DIRECTORY);
            FileInfo[] files = d.GetFiles("*.xml");