diff options
| author | Michael Biebl <biebl@debian.org> | 2022-12-03 22:59:09 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2022-12-03 22:59:09 +0100 |
| commit | 06356c8ac470c1fa46f881b0598ec48a653e69ae (patch) | |
| tree | 42e7714b4caedf4d23ebefd42d8d0afebc6f3569 /src/libnm-platform/nmp-object.c | |
| parent | 78ecd0c8a4a337e38470f3fae5db74daf61ba86a (diff) | |
| parent | 372b62c2c25eb1f2e811f84849e9b69c40ae6245 (diff) | |
Merge branch 'debian/master' into debian/bullseye-backports
Diffstat (limited to 'src/libnm-platform/nmp-object.c')
| -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); |