1 files changed, 5 insertions, 1 deletions
diff --git a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp
index 01bed78..8cb1cab 100644
--- a/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp
+++ b/Swiften/FileTransfer/IncomingJingleFileTransfer.cpp
@@ -1,88 +1,92 @@
 /*
- * Copyright (c) 2011-2015 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/FileTransfer/IncomingJingleFileTransfer.h>
 
 #include <set>
 
 #include <boost/bind.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 
 #include <Swiften/Base/Log.h>
 #include <Swiften/Base/foreach.h>
 #include <Swiften/Elements/JingleFileTransferDescription.h>
 #include <Swiften/Elements/JingleFileTransferHash.h>
 #include <Swiften/Elements/JingleIBBTransportPayload.h>
 #include <Swiften/Elements/JingleS5BTransportPayload.h>
 #include <Swiften/FileTransfer/FileTransferTransporter.h>
 #include <Swiften/FileTransfer/FileTransferTransporterFactory.h>
 #include <Swiften/FileTransfer/IncrementalBytestreamHashCalculator.h>
 #include <Swiften/FileTransfer/TransportSession.h>
 #include <Swiften/FileTransfer/WriteBytestream.h>
 #include <Swiften/Jingle/JingleSession.h>
 #include <Swiften/Network/TimerFactory.h>
 #include <Swiften/Queries/GenericRequest.h>
 #include <Swiften/StringCodecs/Base64.h>
 
 using namespace Swift;
 
 // TODO: ALlow terminate when already terminated.
 
 IncomingJingleFileTransfer::IncomingJingleFileTransfer(
 		const JID& toJID,
 		JingleSession::ref session,
 		JingleContentPayload::ref content,
 		FileTransferTransporterFactory* transporterFactory,
 		TimerFactory* timerFactory,
 		CryptoProvider* crypto) :
 			JingleFileTransfer(session, toJID, transporterFactory),
 			initialContent(content),
 			crypto(crypto),
 			state(Initial),
 			receivedBytes(0),
 			hashCalculator(NULL) {
 	description = initialContent->getDescription<JingleFileTransferDescription>();
 	assert(description);
 	JingleFileTransferFileInfo fileInfo = description->getFileInfo();
 	setFileInfo(fileInfo.getName(), fileInfo.getSize(), fileInfo.getDescription());
 	hashes = fileInfo.getHashes();
 
 	waitOnHashTimer = timerFactory->createTimer(5000);
 	waitOnHashTimerTickedConnection = waitOnHashTimer->onTick.connect(
 			boost::bind(&IncomingJingleFileTransfer::handleWaitOnHashTimerTicked, this));
 }
 
 IncomingJingleFileTransfer::~IncomingJingleFileTransfer() {
+	if (waitOnHashTimer) {
+		waitOnHashTimer->stop();
+	}
+
 	delete hashCalculator;
 	hashCalculator = NULL;
 }
 
 void IncomingJingleFileTransfer::accept(
 		boost::shared_ptr<WriteBytestream> stream,
 		const FileTransferOptions& options) {
 	SWIFT_LOG(debug) << std::endl;
 	if (state != Initial) { SWIFT_LOG(warning) << "Incorrect state" << std::endl; return; }
 
 	assert(!this->stream);
 	this->stream = stream;
 	this->options = options;
 
 	assert(!hashCalculator);
 
 	hashCalculator = new IncrementalBytestreamHashCalculator(
 			hashes.find("md5") != hashes.end(), hashes.find("sha-1") != hashes.end(), crypto);
 
 	writeStreamDataReceivedConnection = stream->onWrite.connect(
 			boost::bind(&IncomingJingleFileTransfer::handleWriteStreamDataReceived, this, _1));
 
 	if (JingleS5BTransportPayload::ref s5bTransport = initialContent->getTransport<JingleS5BTransportPayload>()) {
 		SWIFT_LOG(debug) << "Got S5B transport as initial payload." << std::endl;
 		setTransporter(transporterFactory->createResponderTransporter(
 				getInitiator(), getResponder(), s5bTransport->getSessionID(), options));
 		transporter->addRemoteCandidates(s5bTransport->getCandidates(), s5bTransport->getDstAddr());
 		setState(GeneratingInitialLocalCandidates);
 		transporter->startGeneratingLocalCandidates();
 	}