From 77ce64bed8357669119f23f8c69a87eddf9179d9 Mon Sep 17 00:00:00 2001
From: prashelke <shelke11pravin@gmail.com>
Date: Mon, 16 Oct 2023 16:48:25 +0530
Subject: [PATCH] D35205_PreVersionfolder fix and Re Run Failed Icon related
 function Added

---
 Ginger/Ginger/RunSetPageLib/NewRunSetPage.xaml.cs        | 4 +++-
 Ginger/GingerCoreCommon/Repository/SolutionRepository.cs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Ginger/Ginger/RunSetPageLib/NewRunSetPage.xaml.cs b/Ginger/Ginger/RunSetPageLib/NewRunSetPage.xaml.cs
index 4376ee7f07..cb8448c368 100644
--- a/Ginger/Ginger/RunSetPageLib/NewRunSetPage.xaml.cs
+++ b/Ginger/Ginger/RunSetPageLib/NewRunSetPage.xaml.cs
@@ -376,6 +376,7 @@ private void Runner_PropertyChanged(object sender, System.ComponentModel.Propert
                     }
 
                     UpdateRunButtonIcon();
+                    UpdateReRunFailedButtonIcon();
                 }
             });
         }
@@ -939,6 +940,7 @@ private void RunSetConfig_PropertyChanged(object sender, System.ComponentModel.P
             else if (e.PropertyName == nameof(RunSetConfig.IsRunning))
             {
                 UpdateRunButtonIcon();
+                UpdateReRunFailedButtonIcon();
             }
         }
 
@@ -1947,7 +1949,7 @@ private async void xReRunFailedRunsetBtn_Click(object sender, RoutedEventArgs e)
                         Reporter.ToUser(eUserMsgKey.StaticInfoMessage, $"{string.Join(", ", runnerNames)} is empty, please add {GingerDicser.GetTermResValue(eTermResKey.BusinessFlows)} to run.");
                         return;
                     }
-                    UpdateReRunFailedButtonIcon();
+                    UpdateReRunFailedButtonIcon(true);
                     ResetALMDefectsSuggestions();
 
 
diff --git a/Ginger/GingerCoreCommon/Repository/SolutionRepository.cs b/Ginger/GingerCoreCommon/Repository/SolutionRepository.cs
index b181aad49a..ceda8f2a5c 100644
--- a/Ginger/GingerCoreCommon/Repository/SolutionRepository.cs
+++ b/Ginger/GingerCoreCommon/Repository/SolutionRepository.cs
@@ -489,7 +489,7 @@ public bool IsSolutionPathToAvoid(string pathToCheck)
                 }
             }
 
-            return mCalculatedSolutionPathsToAvoid.Any(Path.GetFullPath(pathToCheck).Contains);
+            return mCalculatedSolutionPathsToAvoid.Any(Path.GetFullPath(pathToCheck).Contains) || mCalculatedSolutionPathsToAvoid.Any(Path.GetFullPath($"{pathToCheck}{Path.DirectorySeparatorChar}").Contains);
         }
 
         #endregion Public Functions