diff options
| author | Michael Biebl <biebl@debian.org> | 2023-10-04 11:46:00 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2023-10-04 11:46:00 +0200 |
| commit | 2f3cc04ff8a04278f01e4636f48a98f8f2e96b21 (patch) | |
| tree | 4fc86e4ed1429cc563941a06b05b3a03b991b368 /src/core/nm-checkpoint.c | |
| parent | 491a3eba00b23412605366b5e0c0b1e35923b9c6 (diff) | |
| parent | d4d8b2b91f7ba000d97a8b2aab48c85000c11314 (diff) | |
Update upstream source from tag 'upstream/1.44.2'
Update to upstream version '1.44.2' with Debian dir 40e7c53062e3f5993a56cbed3a58b49f1c78441a
Diffstat (limited to 'src/core/nm-checkpoint.c')
| -rw-r--r-- | src/core/nm-checkpoint.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/core/nm-checkpoint.c b/src/core/nm-checkpoint.c index 5c4d4e53..74adf484 100644 --- a/src/core/nm-checkpoint.c +++ b/src/core/nm-checkpoint.c @@ -460,24 +460,27 @@ next_dev: NMDeviceState state; nm_manager_for_each_device (priv->manager, device, tmp_lst) { - gboolean found = FALSE; - if (g_hash_table_contains(priv->devices, device)) continue; /* Also ignore devices that were in the checkpoint initially and * were moved to 'removed_devices' because they got removed from * the system. */ - for (i = 0; i < priv->removed_devices->len; i++) { - dev_checkpoint = priv->removed_devices->pdata[i]; - if (dev_checkpoint->dev_type == nm_device_get_device_type(device) - && nm_streq0(dev_checkpoint->original_dev_name, nm_device_get_iface(device))) { - found = TRUE; - break; + if (priv->removed_devices) { + gboolean found = FALSE; + + for (i = 0; i < priv->removed_devices->len; i++) { + dev_checkpoint = priv->removed_devices->pdata[i]; + if (dev_checkpoint->dev_type == nm_device_get_device_type(device) + && nm_streq0(dev_checkpoint->original_dev_name, + nm_device_get_iface(device))) { + found = TRUE; + break; + } } + if (found) + continue; } - if (found) - continue; state = nm_device_get_state(device); if (state > NM_DEVICE_STATE_DISCONNECTED && state < NM_DEVICE_STATE_DEACTIVATING) { |