luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Backend: Fix nil pointer panic in RelatedFiles() #454

Browse source 
Signed-off-by: Michael Mayer <michael@liquidbytes.net>
This commit is contained in:
Michael Mayer 2020-08-12 03:36:49 +02:00
parent d53084b095
commit e0eaa72843
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/photoprism/mediafile.go
View file

@ -313,12 +313,14 @@ func (m *MediaFile) RelatedFiles(stripSequence bool) (result RelatedFiles, err e
result.Main = f
} else if f.IsHEIF() {
result.Main = f
} else if f.IsJpeg() && len(result.Main.FileName()) > len(f.FileName()) {
result.Main = f
} else if f.IsImageOther() {
result.Main = f
} else if f.IsVideo() {
result.Main = f
} else if result.Main != nil && f.IsJpeg() {
if result.Main.IsJpeg() && len(result.Main.FileName()) > len(f.FileName()) {
result.Main = f
}
}
result.Files = append(result.Files, f)