From 146fee37e9c3c4a1d8312aa4291e5ac2c370e629 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sun, 27 Oct 2013 23:56:45 +0000
Subject: [PATCH] merged fix from RC_0_16

---
 ChangeLog       | 1 +
 src/torrent.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9c9349bfd..81673ad3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP
 
+	* graceful pause fix
 	* i2p fixes
 	* fix issue when loading certain malformed .torrent files
 	* pass along host header with http proxy requests and possible http_connection shutdown hang
diff --git a/src/torrent.cpp b/src/torrent.cpp
index 30913aabe..583e55eb9 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -7782,7 +7782,7 @@ namespace libtorrent
 			set_upload_mode(false);
 		}
 
-		if (is_paused())
+		if (is_paused() && !m_graceful_pause_mode)
 		{
 			// let the stats fade out to 0
 			accumulator += m_stat;