maybe fixes chelh#37

andyqp · Sep 4, 2018 · 4129b9e · 4129b9e
1 parent a67bb92
commit 4129b9e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/VBASync/Model/VbaFolder.cs b/src/VBASync/Model/VbaFolder.cs
@@ -78,8 +78,7 @@ public IList<KeyValuePair<string, Tuple<string, ModuleType>>> GetCodeModules()
 
         public void ReplaceFormControls(string name, VbaFolder source)
         {
-            _so.FileCopy(FindFrxPath(source.FindModulePath(name, ModuleType.Form)),
-                FindFrxPath(FindModulePath(name, ModuleType.Form)), true);
+            _so.FileCopy(source.FindFrxPath(name), FindFrxPath(name), true);
         }
 
         public void ReplaceTextModule(string name, ModuleType type, VbaFolder source, string fallbackText)
@@ -130,7 +129,7 @@ protected string FindFrxPath(string name)
         }
 
         protected string FindModulePath(string name, ModuleType type)
-            => ModuleFilePaths.Find(s => string.Equals(_so.PathGetFileName(s), name + ModuleProcessing.ExtensionFromType(type),
+            => ModuleFilePaths.Find(s => string.Equals(_so.PathGetFileName(s), _so.PathGetFileName(name + ModuleProcessing.ExtensionFromType(type)),
                 StringComparison.OrdinalIgnoreCase));
 
         protected virtual List<string> GetModuleFilePaths() => GetModuleFilePaths(false);