Fix issue with overrides

- Overrides wouldn't run if a matching file was already found on disk
gotdibbs · Jan 10, 2016 · 298ccc8 · 298ccc8
1 parent bc13f08
commit 298ccc8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/Imposter.Fiddler.Installer/Properties/AssemblyInfo.cs b/Imposter.Fiddler.Installer/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.5")]
-[assembly: AssemblyFileVersion("1.0.0.5")]
+[assembly: AssemblyVersion("1.0.0.6")]
+[assembly: AssemblyFileVersion("1.0.0.6")]
diff --git a/Imposter.Fiddler/Helpers/PathHelper.cs b/Imposter.Fiddler/Helpers/PathHelper.cs
@@ -20,11 +20,6 @@ public static string GetLocalFilePath(string urlFragment, string localDirectory,
         {
             var path = localDirectory + @"\" + urlFragment.Replace("/", @"\");
 
-            if (File.Exists(path))
-            {
-                return path;
-            }
-
             foreach (var ovr in overrides)
             {
                 if (ovr != null &&
@@ -37,6 +32,11 @@ public static string GetLocalFilePath(string urlFragment, string localDirectory,
                 }
             }
 
+            if (File.Exists(path))
+            {
+                return path;
+            }
+
             return null;
         }
 

diff --git a/Imposter.Fiddler/Properties/AssemblyInfo.cs b/Imposter.Fiddler/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Imposter.Fiddler")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyCopyright("Copyright ©  2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,6 +32,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.5")]
-[assembly: AssemblyFileVersion("1.0.0.5")]
+[assembly: AssemblyVersion("1.0.0.6")]
+[assembly: AssemblyFileVersion("1.0.0.6")]
 [assembly: Fiddler.RequiredVersion("2.2.8.6")]