From b28230411a3f47bbba71b905e3982575308f81f4 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 20 Nov 2013 18:24:38 +0100 Subject: [PATCH] port-serial: always set the forced_close flag if forced to close --- src/mm-port-serial.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mm-port-serial.c b/src/mm-port-serial.c index 1423a05a..7493b3ce 100644 --- a/src/mm-port-serial.c +++ b/src/mm-port-serial.c @@ -1245,6 +1245,10 @@ port_serial_close_force (MMPortSerial *self) mm_dbg ("(%s) forced to close port", mm_port_get_device (MM_PORT (self))); + /* Mark as having forced the close, so that we don't warn about incorrect + * open counts */ + self->priv->forced_close = TRUE; + /* If already closed, done */ if (!self->priv->open_count && !self->priv->reopen_ctx) return; @@ -1256,10 +1260,6 @@ port_serial_close_force (MMPortSerial *self) self->priv->open_count = 1; mm_port_serial_close (self); - /* Mark as having forced the close, so that we don't warn about incorrect - * open counts */ - self->priv->forced_close = TRUE; - /* Notify about the forced close status */ g_signal_emit (self, signals[FORCED_CLOSE], 0); }