From 31d98a1d2e5081ef2ca2d941f7e3b92344185399 Mon Sep 17 00:00:00 2001
From: Michael Drake <michael.drake@codethink.co.uk>
Date: Tue, 25 Apr 2017 15:14:56 +0100
Subject: [PATCH] Core hotlist: Ensure any hotlist save callback is removed on
 hotlist_fini.

---
 desktop/hotlist.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/desktop/hotlist.c b/desktop/hotlist.c
index 7cae78165..3e2fcedd5 100644
--- a/desktop/hotlist.c
+++ b/desktop/hotlist.c
@@ -1368,6 +1368,10 @@ nserror hotlist_fini(void)
 
 	LOG("Finalising hotlist");
 
+	/* Remove any existing scheduled save callback */
+	guit->misc->schedule(-1, hotlist_schedule_save_cb, NULL);
+	hl_ctx.save_scheduled = false;
+
 	/* Save the hotlist */
 	err = hotlist_save(hl_ctx.save_path);
 	if (err != NSERROR_OK) {