LogalDeveloper/owncast
LogalDeveloper/owncast
0
Fork 0
Code

fix(emoji): hopefully guard against the crash in #3331

Browse Source
This commit is contained in:
Gabe Kangas 2023-10-21 22:13:13 -07:00
parent b1c0e14161
commit 027f2544e3
No known key found for this signature in database
GPG Key ID: 4345B2060657F330
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/data/emoji.go
View File

@ -45,12 +45,16 @@ func UpdateEmojiList(force bool) (time.Time, error) {
if force { if force {
emojiCacheModTime = time.Now() emojiCacheModTime = time.Now()
} }
emojiFS := os.DirFS(config.CustomEmojiPath) emojiFS := os.DirFS(config.CustomEmojiPath)
if emojiFS == nil {
return modTime, fmt.Errorf("unable to open custom emoji directory")
}
emojiCacheData = make([]models.CustomEmoji, 0) emojiCacheData = make([]models.CustomEmoji, 0)
walkFunction := func(path string, d os.DirEntry, err error) error { walkFunction := func(path string, d os.DirEntry, err error) error {
if d.IsDir() { if d == nil || d.IsDir() {
return nil return nil
} }