From 65fa81b6be3975245db36a2bbccdc6413deb7819 Mon Sep 17 00:00:00 2001 From: DingDongSoLong4 <99329275+DingDongSoLong4@users.noreply.github.com> Date: Fri, 6 Oct 2023 10:33:52 +0200 Subject: [PATCH] Fix identify nil dereference (#4171) --- internal/identify/identify.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/identify/identify.go b/internal/identify/identify.go index db8ca2f54..86a73c009 100644 --- a/internal/identify/identify.go +++ b/internal/identify/identify.go @@ -126,10 +126,14 @@ func (t *SceneIdentifier) scrapeScene(ctx context.Context, txnManager txn.Manage // Returns a MetadataOptions object with any default options overwritten by source specific options func (t *SceneIdentifier) getOptions(source ScraperSource) MetadataOptions { - options := *t.DefaultOptions + var options MetadataOptions + if t.DefaultOptions != nil { + options = *t.DefaultOptions + } if source.Options == nil { return options } + if source.Options.SetCoverImage != nil { options.SetCoverImage = source.Options.SetCoverImage } @@ -151,6 +155,7 @@ func (t *SceneIdentifier) getOptions(source ScraperSource) MetadataOptions { if source.Options.SkipSingleNamePerformerTag != nil && len(*source.Options.SkipSingleNamePerformerTag) > 0 { options.SkipSingleNamePerformerTag = source.Options.SkipSingleNamePerformerTag } + return options }