Fix for #515, updated tests

osxphotos/_version.py

@@ -1,3 +1,3 @@
 """ version info """
 
-__version__ = "0.42.81"
+__version__ = "0.42.82"

osxphotos/photoinfo/_photoinfo_export.py

@@ -837,13 +837,18 @@ def export2(
                         count = 1
                         glob_str = str(dest.parent / f"{dest.stem}*")
                         dest_files = glob.glob(glob_str)
-                        dest_files = [pathlib.Path(f).stem for f in dest_files]
+                        dest_files = [normalize_fs_path(pathlib.Path(f).stem) for f in dest_files]
                         dest_new = dest.stem
-                        while dest_new in dest_files:
+                        while normalize_fs_path(dest_new) in dest_files:
                             dest_new = f"{dest.stem} ({count})"
                             count += 1
                         dest = dest.parent / f"{dest_new}{dest.suffix}"
 
+            if export_original:
+                dest_original = dest
+            else:
+                dest_edited = dest
+
             # export the dest file
             results = self._export_photo(
                 src,