1 files changed, 27 insertions, 5 deletions
diff --git a/src/downloadmanagerproxy.cpp b/src/downloadmanagerproxy.cpp
index 4a5c9b6b..95099044 100644
--- a/src/downloadmanagerproxy.cpp
+++ b/src/downloadmanagerproxy.cpp
@@ -4,10 +4,32 @@
 #include "organizerproxy.h"
 
 using namespace MOBase;
+using namespace MOShared;
 
-DownloadManagerProxy::DownloadManagerProxy(OrganizerProxy* oproxy, IDownloadManager* downloadManager) :
+DownloadManagerProxy::DownloadManagerProxy(OrganizerProxy* oproxy, DownloadManager* downloadManager) :
   m_OrganizerProxy(oproxy), m_Proxied(downloadManager) { }
 
+DownloadManagerProxy::~DownloadManagerProxy()
+{
+  disconnectSignals();
+}
+
+void DownloadManagerProxy::connectSignals()
+{
+  m_Connections.push_back(m_Proxied->onDownloadComplete(callSignalIfPluginActive(m_OrganizerProxy, m_DownloadComplete)));
+  m_Connections.push_back(m_Proxied->onDownloadFailed(callSignalIfPluginActive(m_OrganizerProxy, m_DownloadFailed)));
+  m_Connections.push_back(m_Proxied->onDownloadRemoved(callSignalIfPluginActive(m_OrganizerProxy, m_DownloadRemoved)));
+  m_Connections.push_back(m_Proxied->onDownloadPaused(callSignalIfPluginActive(m_OrganizerProxy, m_DownloadPaused)));
+}
+
+void DownloadManagerProxy::disconnectSignals()
+{
+  for (auto& conn : m_Connections) {
+    conn.disconnect();
+  }
+  m_Connections.clear();
+}
+
 int DownloadManagerProxy::startDownloadURLs(const QStringList& urls)
 {
   return m_Proxied->startDownloadURLs(urls);
@@ -25,20 +47,20 @@ QString DownloadManagerProxy::downloadPath(int id)
 
 bool DownloadManagerProxy::onDownloadComplete(const std::function<void(int)>& callback)
 {
-  return m_Proxied->onDownloadComplete(MOShared::callIfPluginActive(m_OrganizerProxy, callback));
+  return m_DownloadComplete.connect(callback).connected();
 }
 
 bool DownloadManagerProxy::onDownloadPaused(const std::function<void(int)>& callback)
 {
-  return m_Proxied->onDownloadPaused(MOShared::callIfPluginActive(m_OrganizerProxy, callback));
+  return m_DownloadPaused.connect(callback).connected();
 }
 
 bool DownloadManagerProxy::onDownloadFailed(const std::function<void(int)>& callback)
 {
-  return m_Proxied->onDownloadFailed(MOShared::callIfPluginActive(m_OrganizerProxy, callback));
+  return m_DownloadFailed.connect(callback).connected();
 }
 
 bool DownloadManagerProxy::onDownloadRemoved(const std::function<void(int)>& callback)
 {
-  return m_Proxied->onDownloadRemoved(MOShared::callIfPluginActive(m_OrganizerProxy, callback));
+  return m_DownloadRemoved.connect(callback).connected();
 }