From b786ac0debc7aa5e9a6b0f00bd61e15d9daea049 Mon Sep 17 00:00:00 2001 From: Ben Chan Date: Thu, 26 Sep 2013 00:10:59 -0700 Subject: [PATCH] serial-port: ensure GCancellable handler is disconnected when serial port is closed --- src/mm-serial-port.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/mm-serial-port.c b/src/mm-serial-port.c index 8774d40c..dd82ce94 100644 --- a/src/mm-serial-port.c +++ b/src/mm-serial-port.c @@ -1112,6 +1112,13 @@ mm_serial_port_close (MMSerialPort *self) priv->queue_id = 0; } + if (priv->cancellable_id) { + g_assert (priv->cancellable != NULL); + g_cancellable_disconnect (priv->cancellable, + priv->cancellable_id); + priv->cancellable_id = 0; + } + g_clear_object (&priv->cancellable); }