colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iface-modem: ignore registration-related state changes if enabling or disabling

Browse Source
This commit is contained in:
Aleksander Morgado
2012-10-24 16:22:55 +02:00
parent db80fd2550
commit f667898eca
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/mm-iface-modem.c
View File

@@ -1329,11 +1329,22 @@ mm_iface_modem_update_subsystem_state (MMIfaceModem *self,
MMModemStateChangeReason reason) MMModemStateChangeReason reason)
{ {
MMModemState consolidated; MMModemState consolidated;
MMModemState state = MM_MODEM_STATE_UNKNOWN;
g_object_get (self,
MM_IFACE_MODEM_STATE, &state,
NULL);
/* We may have different subsystems being handled (e.g. 3GPP and CDMA), and /* We may have different subsystems being handled (e.g. 3GPP and CDMA), and
* the registration status value is unique, so if we get subsystem-specific * the registration status value is unique, so if we get subsystem-specific
* state updates, we'll need to merge all to get a consolidated one. */ * state updates, we'll need to merge all to get a consolidated one. */
consolidated = get_updated_consolidated_state (self, subsystem, new_state); consolidated = get_updated_consolidated_state (self, subsystem, new_state);
/* Don't update registration-related states while disabling/enabling */
if (state == MM_MODEM_STATE_ENABLING ||
state == MM_MODEM_STATE_DISABLING)
return;
mm_iface_modem_update_state (self, consolidated, reason); mm_iface_modem_update_state (self, consolidated, reason);
} }