Folder merge fix

Krummers · Dec 16, 2023 · 6143b78 · 6143b78
1 parent ee71ff8
commit 6143b78
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/Patcher/Modules/file.py b/Patcher/Modules/file.py
@@ -58,6 +58,8 @@ class Folder(File):
     def merge(self, other):
         if not isinstance(other, Folder):
             raise TypeError("'other' must be a folder")
+        if self.path == other.path:
+            return
         for file in os.listdir(other.path):
             if os.path.isfile(os.path.join(other.path, file)):
                 old = File(os.path.join(self.path, file))