brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

color-device: Clear pending flags always when finished

Browse Source 
Even if the task was cancelled or an error occured.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2627>
This commit is contained in:
Sebastian Wick 2022-09-19 19:31:37 +02:00 committed by Marge Bot
parent a8259240ae
commit 19837796fe
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backends/meta-color-device.c
View File

@ -367,6 +367,8 @@ on_cd_device_connected (GObject *source_object,
MetaColorDevice *color_device = user_data; MetaColorDevice *color_device = user_data;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
color_device->pending_state &= ~PENDING_CONNECTED;
if (!cd_device_connect_finish (cd_device, res, &error)) if (!cd_device_connect_finish (cd_device, res, &error))
{ {
if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
@ -386,8 +388,6 @@ on_cd_device_connected (GObject *source_object,
color_device->cd_device_id); color_device->cd_device_id);
} }
color_device->pending_state &= ~PENDING_CONNECTED;
g_signal_connect (cd_device, "changed", g_signal_connect (cd_device, "changed",
G_CALLBACK (on_cd_device_changed), color_device); G_CALLBACK (on_cd_device_changed), color_device);
update_assigned_profile (color_device); update_assigned_profile (color_device);
@ -400,6 +400,8 @@ on_profile_ready (MetaColorProfile *color_profile,
gboolean success, gboolean success,
MetaColorDevice *color_device) MetaColorDevice *color_device)
{ {
color_device->pending_state &= ~PENDING_PROFILE_READY;
if (!success) if (!success)
{ {
g_clear_object (&color_device->device_profile); g_clear_object (&color_device->device_profile);
@ -408,7 +410,6 @@ on_profile_ready (MetaColorProfile *color_profile,
return; return;
} }
color_device->pending_state &= ~PENDING_PROFILE_READY;
maybe_finish_setup (color_device); maybe_finish_setup (color_device);
} }
@ -422,6 +423,8 @@ ensure_device_profile_cb (GObject *source_object,
MetaColorProfile *color_profile; MetaColorProfile *color_profile;
g_autoptr (GError) error = NULL; g_autoptr (GError) error = NULL;
color_device->pending_state &= ~PENDING_EDID_PROFILE;
color_profile = meta_color_store_ensure_device_profile_finish (color_store, color_profile = meta_color_store_ensure_device_profile_finish (color_store,
res, res,
&error); &error);
@ -441,7 +444,6 @@ ensure_device_profile_cb (GObject *source_object,
meta_topic (META_DEBUG_COLOR, "Color device '%s' generated", meta_topic (META_DEBUG_COLOR, "Color device '%s' generated",
color_device->cd_device_id); color_device->cd_device_id);
color_device->pending_state &= ~PENDING_EDID_PROFILE;
g_set_object (&color_device->device_profile, color_profile); g_set_object (&color_device->device_profile, color_profile);
if (!meta_color_profile_is_ready (color_profile)) if (!meta_color_profile_is_ready (color_profile))