diff options
| author | Michael Biebl <biebl@debian.org> | 2022-11-18 17:49:21 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-11-18 17:49:21 +0100 |
| commit | 35b6136bc39c77da74de1325e13871bc985c5352 (patch) | |
| tree | f5d91944aa7b1df3b4cf397e617e9af9cfea89cf /src/libnm-platform | |
| parent | c9f38062acbf43edb3b33c336ba19a449664c3de (diff) | |
| parent | 913bcb40f6c699f8a38351c69e7ea263fe78f71f (diff) | |
Update upstream source from tag 'upstream/1.40.4'
Update to upstream version '1.40.4' with Debian dir 7084cdfc71b038bf79ea5f3c53dfea86e49c80cb
Diffstat (limited to 'src/libnm-platform')
| -rw-r--r-- | src/libnm-platform/nmp-object.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/libnm-platform/nmp-object.c b/src/libnm-platform/nmp-object.c index d06aa9cd..6609a7d5 100644 --- a/src/libnm-platform/nmp-object.c +++ b/src/libnm-platform/nmp-object.c @@ -1318,10 +1318,9 @@ nmp_object_copy(NMPObject *dst, const NMPObject *src, gboolean id_only) g_return_if_fail(klass == NMP_OBJECT_GET_CLASS(src)); - if (id_only) { - if (klass->cmd_plobj_id_copy) - klass->cmd_plobj_id_copy(&dst->object, &src->object); - } else if (klass->cmd_obj_copy) + if (id_only && klass->cmd_plobj_id_copy) + klass->cmd_plobj_id_copy(&dst->object, &src->object); + else if (klass->cmd_obj_copy) klass->cmd_obj_copy(dst, src); else memcpy(&dst->object, &src->object, klass->sizeof_data); |