# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1682972653 -7200
# Node ID bc46cfe7c037a16ea1d45d77e0d30f8c66b7dc2f
# Parent  41598b7ec54342a13f98a9e7dea1866ea9ec1362# Parent  214a679823e881b1d0e067125515a664a19c6c52
Merge 0.12->trunk

diff -r 41598b7ec543 -r bc46cfe7c037 plugins/mod_csi_simple.lua
--- a/plugins/mod_csi_simple.lua	Sun Apr 30 23:45:55 2023 +0200
+++ b/plugins/mod_csi_simple.lua	Mon May 01 22:24:13 2023 +0200
@@ -166,6 +166,10 @@
 		session.conn:pause_writes();
 		session.csi_measure_buffer_hold = measure_buffer_hold();
 		session.csi_counter = 0;
+		if session.csi_resume then
+			timer.stop(session.csi_resume);
+			session.csi_resume = nil;
+		end
 		filters.add_filter(session, "stanzas/out", manage_buffer);
 		filters.add_filter(session, "bytes/in", flush_buffer);
 	else
@@ -177,6 +181,10 @@
 	filters.remove_filter(session, "stanzas/out", manage_buffer);
 	filters.remove_filter(session, "bytes/in", flush_buffer);
 	session.csi_counter = nil;
+	if session.csi_resume then
+		timer.stop(session.csi_resume);
+		session.csi_resume = nil;
+	end
 	if session.csi_measure_buffer_hold then
 		session.csi_measure_buffer_hold();
 		session.csi_measure_buffer_hold = nil;