From b7f938531b5da06926425ec8f4bc7cc374d9f69f Mon Sep 17 00:00:00 2001
From: dogwithakeyboard <128322708+dogwithakeyboard@users.noreply.github.com>
Date: Thu, 27 Jun 2024 01:12:39 +0100
Subject: [PATCH] Check for null disambiguation on validate (#5019)

---
 pkg/performer/validate.go      | 12 ++++++++----
 pkg/performer/validate_test.go | 10 +++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkg/performer/validate.go b/pkg/performer/validate.go
index 0106490cf..68f7a8ef5 100644
--- a/pkg/performer/validate.go
+++ b/pkg/performer/validate.go
@@ -102,11 +102,15 @@ func validateName(ctx context.Context, name string, disambig string, existingID
 		},
 	}
 
+	modifier := models.CriterionModifierIsNull
+
 	if disambig != "" {
-		performerFilter.Disambiguation = &models.StringCriterionInput{
-			Value:    disambig,
-			Modifier: models.CriterionModifierEquals,
-		}
+		modifier = models.CriterionModifierEquals
+	}
+
+	performerFilter.Disambiguation = &models.StringCriterionInput{
+		Value:    disambig,
+		Modifier: modifier,
 	}
 
 	if existingID == nil {
diff --git a/pkg/performer/validate_test.go b/pkg/performer/validate_test.go
index 778459f17..33f4b1cec 100644
--- a/pkg/performer/validate_test.go
+++ b/pkg/performer/validate_test.go
@@ -15,6 +15,9 @@ func nameFilter(n string) *models.PerformerFilterType {
 			Value:    n,
 			Modifier: models.CriterionModifierEquals,
 		},
+		Disambiguation: &models.StringCriterionInput{
+			Modifier: models.CriterionModifierIsNull,
+		},
 	}
 }
 
@@ -41,13 +44,6 @@ func TestValidateName(t *testing.T) {
 		newName     = "new name"
 		newDisambig = "new disambiguation"
 	)
-	// existing1 := models.Performer{
-	// 	Name: name1,
-	// }
-	// existing2 := models.Performer{
-	// 	Name:           name2,
-	// 	Disambiguation: disambig,
-	// }
 
 	pp := 1
 	findFilter := &models.FindFilterType{