summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2016-04-20 12:52:47 +0200
committerLubomir Rintel <lkundrak@v3.sk>2016-04-20 13:57:57 +0200
commit22c11f8ef1529b2858c4946b2c666cca79908ef7 (patch)
treeeb2b4ce6dc3ba2d47ce9d78b9b054ebf452d49c4
parent1fa73633d3f9ec8a1ebd95d3e9cb26d5121236f6 (diff)
downloadNetworkManager-22c11f8ef1529b2858c4946b2c666cca79908ef7.tar.gz
modem: cancel secrets only if there's an outstanding request
Fixes an assertion failure on WWAN connection attempts that fail before secrets are requested.
-rw-r--r--src/devices/wwan/nm-modem.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c
index 2a8a9d1e92..804a6d9c97 100644
--- a/src/devices/wwan/nm-modem.c
+++ b/src/devices/wwan/nm-modem.c
@@ -742,7 +742,8 @@ cancel_get_secrets (NMModem *self)
{
NMModemPrivate *priv = NM_MODEM_GET_PRIVATE (self);
- nm_act_request_cancel_secrets (priv->act_request, priv->secrets_id);
+ if (priv->secrets_id)
+ nm_act_request_cancel_secrets (priv->act_request, priv->secrets_id);
}
static void