From 6982bf50e42556cb5e61d894a96dd8dae24a68ed Mon Sep 17 00:00:00 2001
From: Alexander van Delft <a.vandelft@rheagroup.com>
Date: Wed, 22 May 2024 12:57:49 +0200
Subject: [PATCH] Fix bug

---
 .../BusinessLogic/OldParameterContextProvider.cs    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/CometServer/Services/BusinessLogic/OldParameterContextProvider.cs b/CometServer/Services/BusinessLogic/OldParameterContextProvider.cs
index c718b98f..e18ad40d 100644
--- a/CometServer/Services/BusinessLogic/OldParameterContextProvider.cs
+++ b/CometServer/Services/BusinessLogic/OldParameterContextProvider.cs
@@ -210,8 +210,17 @@ public ParameterValueSet GetsourceValueSet(Guid? option, Guid? state)
                         : this.OldValueSet.FirstOrDefault(x => x.ActualOption == option.Value);
                 }
 
-                // old is only state dependent
-                return this.OldDefaultState != null ? this.OldValueSet.FirstOrDefault(x => x.ActualState == this.OldDefaultState.Iid) : this.OldValueSet.FirstOrDefault();
+                if (!this.IsOldOptionDependent)
+                {
+                    // old is only state dependent
+                    return this.OldDefaultState != null ? this.OldValueSet.FirstOrDefault(x => x.ActualState == this.OldDefaultState.Iid) : this.OldValueSet.FirstOrDefault();
+                }
+
+                if (!this.IsOldStateDependent)
+                {
+                    // old is only option dependent
+                    return this.OldDefaultOption != null ? this.OldValueSet.FirstOrDefault(x => x.ActualOption == option.Value) : this.OldValueSet.FirstOrDefault();
+                }
             }
 
             // new is only state dependent