From f200a37e4314dc900bc50f4152091dcb1cb338c1 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <quaritsch@ivt.tugraz.at>
Date: Mon, 27 Feb 2023 09:18:09 +0100
Subject: [PATCH] vecto gui: protect reading new config values

---
 VECTO/Configuration.vb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/VECTO/Configuration.vb b/VECTO/Configuration.vb
index c6109098af..4569c5e1e1 100644
--- a/VECTO/Configuration.vb
+++ b/VECTO/Configuration.vb
@@ -123,11 +123,11 @@ Public Class Configuration
 				DeclMode = body.GetEx(Of Boolean)(_declmode)
 				ValidateRunData = IsNothing(body(_validaterundata)) OrElse body.GetEx(Of Boolean)(_validaterundata)
                 OutputFolder = If(body(_outputfolder) Is Nothing, "", body(_outputfolder).Value(of string)())
-				SaveVectoRunData = body.GetEx(Of Boolean)(_saverundata)
+				SaveVectoRunData = If(body(_saverundata) Is Nothing, False, body.GetEx(Of Boolean)(_saverundata))
 
-				InitialSOCOverride = body.GetEx(Of Boolean)(_overrideinitialsoc)
-				InitialSOCOverrideValue = body.GetEx(Of Double)(_overrideinitialsocvalue)
-				ChargeSustainingIterationModeDeActivated = body.GetEx(Of Boolean)(_csItActive)
+				InitialSOCOverride = if(body(_overrideinitialsoc) is nothing, false, body.GetEx(Of Boolean)(_overrideinitialsoc))
+				InitialSOCOverrideValue = if (body(_overrideinitialsoc) Is Nothing, 50, body.GetEx(Of Double)(_overrideinitialsocvalue))
+				ChargeSustainingIterationModeDeActivated = if (body(_csItActive) Is Nothing, true, body.GetEx(Of Boolean)(_csItActive))
 
 
 			End Using
-- 
GitLab