From 5dccdf7750611c78de5356bb02f6023d4fc382c5 Mon Sep 17 00:00:00 2001
From: Rhet Turnbull <rturnbull+git@gmail.com>
Date: Wed, 30 Dec 2020 07:31:07 -0800
Subject: [PATCH] Fixed --exiftool-path bug, issue #308

---
 osxphotos/__main__.py | 3 +--
 osxphotos/_version.py | 2 +-
 osxphotos/exiftool.py | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/osxphotos/__main__.py b/osxphotos/__main__.py
index 573964bf..e350064d 100644
--- a/osxphotos/__main__.py
+++ b/osxphotos/__main__.py
@@ -1822,7 +1822,6 @@ def export(
         ("exiftool_option", ("exiftool")),
         ("exiftool_merge_keywords", ("exiftool", "sidecar")),
         ("exiftool_merge_persons", ("exiftool", "sidecar")),
-        ("exiftool_path", ("exiftool", "exiftool_merge_keywords", "exiftool_merge_persons")),
     ]
     try:
         cfg.validate(exclusive=exclusive_options, dependent=dependent_options, cli=True)
@@ -1906,7 +1905,7 @@ def export(
             )
             ctx.exit(2)
 
-    if exiftool or exiftool_merge_keywords or exiftool_merge_persons:
+    if any([exiftool, exiftool_path, exiftool_merge_keywords, exiftool_merge_persons]):
         verbose_(f"exiftool path: {exiftool_path}")
 
     isphoto = ismovie = True  # default searches for everything
diff --git a/osxphotos/_version.py b/osxphotos/_version.py
index 3632b8de..d2b0f96e 100644
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,5 +1,5 @@
 """ version info """
 
-__version__ = "0.38.21"
+__version__ = "0.38.22"
 
 
diff --git a/osxphotos/exiftool.py b/osxphotos/exiftool.py
index cc31fc36..2f0972ee 100644
--- a/osxphotos/exiftool.py
+++ b/osxphotos/exiftool.py
@@ -49,7 +49,7 @@ class _ExifToolProc:
 
         if hasattr(self, "_process_running") and self._process_running:
             # already running
-            if exiftool != self._exiftool:
+            if exiftool is not None and exiftool != self._exiftool:
                 logging.warning(
                     f"exiftool subprocess already running, "
                     f"ignoring exiftool={exiftool}"