1 files changed, 18 insertions, 19 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index 613249b..3bfdd3f 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -68,20 +68,37 @@ Client::Client(const JID& jid, const SafeString& password, NetworkFactories* net
 	nickResolver = new NickResolver(jid.toBare(), roster, vcardManager, mucRegistry);
 
 	blindCertificateTrustChecker = new BlindCertificateTrustChecker();
 	
 	jingleSessionManager = new JingleSessionManager(getIQRouter());
 	blockListManager = new ClientBlockListManager(getIQRouter());
-	fileTransferManager = NULL;
 
 	whiteboardSessionManager = NULL;
 #ifdef SWIFT_EXPERIMENTAL_WB
 	whiteboardSessionManager = new WhiteboardSessionManager(getIQRouter(), getStanzaChannel(), presenceOracle, getEntityCapsProvider());
 #endif
 
 	pubsubManager = new PubSubManagerImpl(getStanzaChannel(), getIQRouter());
+
+#ifdef SWIFT_EXPERIMENTAL_FT
+	fileTransferManager = new FileTransferManagerImpl(
+			getJID(),
+			jingleSessionManager,
+			getIQRouter(),
+			getEntityCapsProvider(),
+			presenceOracle,
+			getNetworkFactories()->getConnectionFactory(),
+			getNetworkFactories()->getConnectionServerFactory(),
+			getNetworkFactories()->getTimerFactory(),
+			getNetworkFactories()->getDomainNameResolver(),
+			getNetworkFactories()->getNetworkEnvironment(),
+			getNetworkFactories()->getNATTraverser(),
+			getNetworkFactories()->getCryptoProvider());
+#else
+	fileTransferManager = new DummyFileTransferManager();
+#endif
 }
 
 Client::~Client() {
 	delete pubsubManager;
 	delete whiteboardSessionManager;
 
@@ -123,30 +140,12 @@ XMPPRoster* Client::getRoster() const {
 
 void Client::setSoftwareVersion(const std::string& name, const std::string& version, const std::string& os) {
 	softwareVersionResponder->setVersion(name, version, os);
 }
 
 void Client::handleConnected() {
-	delete fileTransferManager;
-#ifdef SWIFT_EXPERIMENTAL_FT
-	fileTransferManager = new FileTransferManagerImpl(
-			getJID(), 
-			jingleSessionManager, 
-			getIQRouter(), 
-			getEntityCapsProvider(), 
-			presenceOracle, 
-			getNetworkFactories()->getConnectionFactory(), 
-			getNetworkFactories()->getConnectionServerFactory(), 
-			getNetworkFactories()->getTimerFactory(), 
-			getNetworkFactories()->getDomainNameResolver(),
-			getNetworkFactories()->getNetworkEnvironment(),
-			getNetworkFactories()->getNATTraverser(),
-			getNetworkFactories()->getCryptoProvider());
-#else
-	fileTransferManager = new DummyFileTransferManager();
-#endif
 	discoManager->handleConnected();
 }
 
 void Client::requestRoster() {
 	// FIXME: We should set this once when the session is finished, but there
 	// is currently no callback for this