color-device: Return early if the deivce becomes ready due to an error
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2627>
This commit is contained in:
parent
ed554615f8
commit
2476a8cedd
@ -378,6 +378,7 @@ on_cd_device_connected (GObject *source_object,
|
|||||||
|
|
||||||
g_cancellable_cancel (color_device->cancellable);
|
g_cancellable_cancel (color_device->cancellable);
|
||||||
meta_color_device_notify_ready (color_device, FALSE);
|
meta_color_device_notify_ready (color_device, FALSE);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -434,6 +435,7 @@ ensure_device_profile_cb (GObject *source_object,
|
|||||||
|
|
||||||
g_cancellable_cancel (color_device->cancellable);
|
g_cancellable_cancel (color_device->cancellable);
|
||||||
meta_color_device_notify_ready (color_device, FALSE);
|
meta_color_device_notify_ready (color_device, FALSE);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
meta_topic (META_DEBUG_COLOR, "Color device '%s' generated",
|
meta_topic (META_DEBUG_COLOR, "Color device '%s' generated",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user