2 files changed, 7 insertions, 3 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index 323bb43..d2f8b7a 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2012 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -86,6 +86,7 @@ Client::~Client() {
 	delete whiteboardSessionManager;
 
 	delete fileTransferManager;
+	delete blockListManager;
 	delete jingleSessionManager;
 	
 	delete blindCertificateTrustChecker;
@@ -125,6 +126,7 @@ void Client::setSoftwareVersion(const std::string& name, const std::string& vers
 }
 
 void Client::handleConnected() {
+	delete fileTransferManager;
 #ifdef SWIFT_EXPERIMENTAL_FT
 	fileTransferManager = new FileTransferManagerImpl(
 			getJID(), 
diff --git a/Swiften/FileTransfer/FileTransferManagerImpl.cpp b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
index fe8bfd6..f439197 100644
--- a/Swiften/FileTransfer/FileTransferManagerImpl.cpp
+++ b/Swiften/FileTransfer/FileTransferManagerImpl.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2013-2014 Isode Limited.
+ * Copyright (c) 2013-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -86,10 +86,12 @@ FileTransferManagerImpl::FileTransferManagerImpl(
 }
 
 FileTransferManagerImpl::~FileTransferManagerImpl() {
-	delete s5bServerManager;
 	delete incomingFTManager;
 	delete outgoingFTManager;
 	delete transporterFactory;
+	delete bytestreamProxy;
+	delete s5bServerManager;
+	delete bytestreamRegistry;
 }
 
 void FileTransferManagerImpl::start() {