Changed the Environment Reference

Ginger/Ginger/ValueExpression/ValueExpressionEditorPage.xaml.cs

@@ -40,6 +40,7 @@ limitations under the License.
 using System.Collections.Generic;
 using System.Dynamic;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
@@ -941,16 +942,26 @@ private void xTestButton_Click(object sender, RoutedEventArgs e)
         {
             if (mVE == null)
             {
-                if (mContext.Environment == null && mEnvs != null && mEnvs.Count > 0)
+                if (mContext.Environment == null && mEnvs != null && mEnvs.Count > 0 && WorkSpace.Instance.UserProfile.RecentEnvironment != Guid.Empty)
                 {
-                    mContext.Environment = mEnvs[0];
+                    // selects the current environment in use. this environment is then used to get the values of the environment variables
+                    mContext.Environment = GetCurrentEnvironment();
                 }
                 mVE = new ValueExpression(mContext.Environment, mContext, WorkSpace.Instance.SolutionRepository.GetAllRepositoryItems<DataSourceBase>());
 
             }
             mVE.Value = this.xExpressionUCTextEditor.textEditor.Text;
             xCalculatedTextBox.Text = mVE.ValueCalculated;
         }
+        /// <summary>
+        /// Finds the selected environment from the total list of environments
+        /// </summary>
+        /// <returns>Returns the current environment</returns>
+        private ProjEnvironment? GetCurrentEnvironment()
+        {
+            return mEnvs.FirstOrDefault((mEnv) => mEnv.Guid == WorkSpace.Instance.UserProfile.RecentEnvironment);
+        }
+
 
         private void OKButton_Click(object sender, RoutedEventArgs e)
         {