From 7b2621c3de970b9b7e5378a3937933e9d92a07be Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 22 Feb 2021 20:22:22 +0000 Subject: [PATCH] trivial: Incorporate by merging the device flags If any flags are set in the baseclass (e.g. FuDevice) then incorporating with a FuUdevDevice or FuUefiDevice is not going to merge the flags. --- libfwupd/fwupd-device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libfwupd/fwupd-device.c b/libfwupd/fwupd-device.c index 5a1d4c916..faf269cfa 100644 --- a/libfwupd/fwupd-device.c +++ b/libfwupd/fwupd-device.c @@ -1402,8 +1402,7 @@ fwupd_device_incorporate (FwupdDevice *self, FwupdDevice *donor) FwupdDevicePrivate *priv = GET_PRIVATE (self); FwupdDevicePrivate *priv_donor = GET_PRIVATE (donor); - if (priv->flags == 0) - fwupd_device_add_flag (self, priv_donor->flags); + fwupd_device_add_flag (self, priv_donor->flags); if (priv->created == 0) fwupd_device_set_created (self, priv_donor->created); if (priv->modified == 0)