Bugfix invalid pumpdefinition.xml

100prznt · Mar 7, 2019 · 0808341 · 0808341
1 parent e0adada
commit 0808341
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/FlowCalc/Controller.cs b/FlowCalc/Controller.cs
@@ -66,11 +66,20 @@ public Controller()
         #endregion Constructor
 
         #region Services
-        public void LoadPump(string path)
+        public bool LoadPump(string path)
         {
-            Pump = Pump.FromFile(path);
+            try
+            {
+                Pump = Pump.FromFile(path);
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+
 
             PumpDefinitionPath = path;
+            return true;
         }
 
         public double CalcFlowRate(double pressure)

diff --git a/FlowCalc/Form1.cs b/FlowCalc/Form1.cs
@@ -39,7 +39,7 @@ public Form1()
             if (!string.IsNullOrWhiteSpace(Properties.Settings.Default.PumpDefinitionPath) &&
                 File.Exists(Properties.Settings.Default.PumpDefinitionPath))
             {
-                m_Controller.LoadPump(Properties.Settings.Default.PumpDefinitionPath);
+                if (m_Controller.LoadPump(Properties.Settings.Default.PumpDefinitionPath))
                 applyPumpDefinition();
             }
         }