aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@lanedo.com>2011-05-09 18:21:46 +0200
committerAleksander Morgado <aleksander@lanedo.com>2011-05-09 18:21:46 +0200
commit673005e6021d6960dcb338ea83d2a21aa8080117 (patch)
tree79fe59a26f103f999c40573ff482af7762aef61e
parent1bc70be993a0f38bf8e4e7f6041927ad76316122 (diff)
manager: avoid assertion warning when enumerating devices
-rw-r--r--src/mm-manager.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mm-manager.c b/src/mm-manager.c
index 561d427c..b9076ee6 100644
--- a/src/mm-manager.c
+++ b/src/mm-manager.c
@@ -322,12 +322,15 @@ enumerate_devices_cb (gpointer key, gpointer val, gpointer user_data)
{
MMModem *modem = MM_MODEM (val);
GPtrArray **devices = (GPtrArray **) user_data;
- const char *path;
if (mm_modem_get_valid (modem)) {
+ const char *path;
+
path = g_object_get_data (G_OBJECT (modem), DBUS_PATH_TAG);
- g_return_if_fail (path != NULL);
- g_ptr_array_add (*devices, g_strdup (path));
+ /* A valid modem without dbus path may happen when enumerating devices
+ * while there is an ongoing modem probing. */
+ if (path)
+ g_ptr_array_add (*devices, g_strdup (path));
}
}