From 758239568644731da70bc9a556da5da983e052d7 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Wed, 21 Feb 2018 14:52:02 -0800
Subject: [PATCH] Cleanup backup handlers timers on the correct thread

---
 domain-server/src/DomainContentBackupManager.cpp | 5 +++++
 domain-server/src/DomainContentBackupManager.h   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/domain-server/src/DomainContentBackupManager.cpp b/domain-server/src/DomainContentBackupManager.cpp
index 9c72d64eea..aa5c247ccf 100644
--- a/domain-server/src/DomainContentBackupManager.cpp
+++ b/domain-server/src/DomainContentBackupManager.cpp
@@ -155,6 +155,11 @@ bool DomainContentBackupManager::process() {
     return isStillRunning();
 }
 
+void DomainContentBackupManager::shutdown() {
+    // Destroy handlers on the correct thread so that they can cleanup timers
+    _backupHandlers.clear();
+}
+
 void DomainContentBackupManager::aboutToFinish() {
     _stopThread = true;
 }
diff --git a/domain-server/src/DomainContentBackupManager.h b/domain-server/src/DomainContentBackupManager.h
index 06a8d0394f..4024794856 100644
--- a/domain-server/src/DomainContentBackupManager.h
+++ b/domain-server/src/DomainContentBackupManager.h
@@ -75,6 +75,7 @@ protected:
     /// Implements generic processing behavior for this thread.
     virtual void setup() override;
     virtual bool process() override;
+    virtual void shutdown() override;
 
     void load();
     void backup();