From 913bcb40f6c699f8a38351c69e7ea263fe78f71f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 18 Nov 2022 17:48:09 +0100 Subject: New upstream version 1.40.4 --- src/libnm-platform/nmp-object.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/libnm-platform') 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); -- cgit 1.3.0-6-gf8a5