From 0c2dc17e8ec5d29cfbfa2981d7c1ad1540f42998 Mon Sep 17 00:00:00 2001 From: InfiniteTF Date: Mon, 25 Apr 2022 08:21:21 +0200 Subject: [PATCH] Fix crash when cancelling pending tasks (#2527) --- internal/manager/manager.go | 7 ++++++- ui/v2.5/src/components/Changelog/versions/v0150.md | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/manager/manager.go b/internal/manager/manager.go index 75a1754dc..096f541f8 100644 --- a/internal/manager/manager.go +++ b/internal/manager/manager.go @@ -151,8 +151,13 @@ func initJobManager() *job.Manager { case j := <-c.RemovedJob: if instance.Config.GetNotificationsEnabled() { cleanDesc := strings.TrimRight(j.Description, ".") - timeElapsed := j.EndTime.Sub(*j.StartTime) + if j.StartTime == nil { + // Task was never started + return + } + + timeElapsed := j.EndTime.Sub(*j.StartTime) desktop.SendNotification("Task Finished", "Task \""+cleanDesc+"\" is finished in "+formatDuration(timeElapsed)+".") } case <-ctx.Done(): diff --git a/ui/v2.5/src/components/Changelog/versions/v0150.md b/ui/v2.5/src/components/Changelog/versions/v0150.md index d81896e12..f3e7b5daf 100644 --- a/ui/v2.5/src/components/Changelog/versions/v0150.md +++ b/ui/v2.5/src/components/Changelog/versions/v0150.md @@ -1,4 +1,5 @@ ### 🐛 Bug fixes +* Fix crash when cancelling pending tasks. ([#2527](https://github.com/stashapp/stash/pull/2527)) * Fix markers not refreshing after creating new marker. ([#2502](https://github.com/stashapp/stash/pull/2502)) * Fix error when submitting scene draft to stash-box without performers. ([#2515](https://github.com/stashapp/stash/pull/2515)) * Fix incorrect video player positioning on touch-enabled devices. ([#2501](https://github.com/stashapp/stash/issues/2501)) \ No newline at end of file