From 1767390e0d4244fddf1069397f5cfbf13aa4ac63 Mon Sep 17 00:00:00 2001
From: peolic <66393006+peolic@users.noreply.github.com>
Date: Wed, 21 Apr 2021 07:19:40 +0300
Subject: [PATCH] Overwrite new performer image after clearing current image
 (#1321)

---
 ui/v2.5/src/components/Changelog/versions/v070.md            | 1 +
 .../Performers/PerformerDetails/PerformerEditPanel.tsx       | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ui/v2.5/src/components/Changelog/versions/v070.md b/ui/v2.5/src/components/Changelog/versions/v070.md
index a0c890aed..83c9afc60 100644
--- a/ui/v2.5/src/components/Changelog/versions/v070.md
+++ b/ui/v2.5/src/components/Changelog/versions/v070.md
@@ -24,6 +24,7 @@
 * Change performer text query to search by name and alias only.
 
 ### 🐛 Bug fixes
+* Fix scraped performer image not updating after clearing the current image when creating a new performer.
 * Fix error preventing adding a new library path when an existing library path is missing.
 * Fix whitespace in query string returning all objects. 
 * Fix hang on Login page when not connected to internet.
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index dce51dd37..499f1cae7 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -311,9 +311,10 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
     // image is a base64 string
     // #404: don't overwrite image if it has been modified by the user
     // overwrite if not new since it came from a dialog
-    // otherwise follow existing behaviour
+    // overwrite if image was cleared (`null`)
+    // otherwise follow existing behaviour (`undefined`)
     if (
-      (!isNew || formik.values.image === undefined) &&
+      (!isNew || [null, undefined].includes(formik.values.image)) &&
       state.image !== undefined
     ) {
       const imageStr = state.image;