Merge pull request #268 from jstrine/fix_path_none

Continue even if the original filename is None, thanks to @jstrine for the fix!
2020-11-25 17:51:38 -08:00
parent e951e5361e 5352aec3b9
commit df7d45659a
1 changed files with 1 additions and 1 deletions
--- a/osxphotos/main.py
+++ b/osxphotos/main.py
@@ -2579,7 +2579,7 @@ def get_filenames_from_template(photo, filename_template, original_name):
            )
        filenames = [f"{file_}{photo_ext}" for file_ in filenames]
    else:
-        filenames = [photo.original_filename] if original_name else [photo.filename]
+                filenames = [photo.original_filename] if (original_name and (photo.original_filename is not None)) else [photo.filename]

    filenames = [sanitize_filename(filename) for filename in filenames]
    return filenames