From 8ea39c3f1cd8c1de045ee4eed52858124e154628 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 20 Apr 2016 12:52:47 +0200 Subject: [PATCH] modem: cancel secrets only if there's an outstanding request Fixes an assertion failure on WWAN connection attempts that fail before secrets are requested. (cherry picked from commit 22c11f8ef1529b2858c4946b2c666cca79908ef7) --- src/devices/wwan/nm-modem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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