core: set modem state before potentially destroying the modem

1 files changed, 2 insertions, 1 deletions

diff --git a/src/mm-modem-base.c b/src/mm-modem-base.c
index 174d9d25..d50d7517 100644
--- a/src/mm-modem-base.c
+++ b/src/mm-modem-base.c
@@ -148,7 +148,6 @@ mm_modem_base_set_valid (MMModemBase *self, gboolean new_valid)
 
     if (priv->valid != new_valid) {
         priv->valid = new_valid;
-        g_object_notify (G_OBJECT (self), MM_MODEM_VALID);
 
         /* Modem starts off in disabled state, and jumps to disabled when
          * it's no longer valid.
@@ -156,6 +155,8 @@ mm_modem_base_set_valid (MMModemBase *self, gboolean new_valid)
         mm_modem_set_state (MM_MODEM (self),
                             MM_MODEM_STATE_DISABLED,
                             MM_MODEM_STATE_REASON_NONE);
+
+        g_object_notify (G_OBJECT (self), MM_MODEM_VALID);
     }
 }