diff options
| author | Ben Chan <benchan@chromium.org> | 2013-09-26 00:10:59 -0700 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2013-09-26 09:22:33 +0200 |
| commit | b786ac0debc7aa5e9a6b0f00bd61e15d9daea049 (patch) | |
| tree | 044bf92caec3e0e3d23c0dbd3fb45668eaa8235f | |
| parent | 2a611c38563db71a1dbd18c8bb56f95a69841c9c (diff) | |
serial-port: ensure GCancellable handler is disconnected when serial port is closed
| -rw-r--r-- | src/mm-serial-port.c | 7 |
1 files changed, 7 insertions, 0 deletions
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); } |