luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 11:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

GWin32AppInfo: simplify appinfo wait condition

Browse Source
This commit is contained in:
Руслан Ижбулатов 2020-12-11 15:18:18 +00:00
parent 4c3a61e221
commit 10def41dc5
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gio/gwin32appinfo.c
View File

@ -3802,17 +3802,11 @@ gio_win32_appinfo_init (gboolean do_wait)
if (!do_wait) if (!do_wait)
return; return;
/* If any of the keys had a change, then we've already initiated /* Previously, we checked each of the watched keys here.
* a tree re-build in keys_updated(). Just wait for it to finish. * Now we just look at the update counter, because each key
* has a change callback keys_updated, which increments this counter.
*/ */
if ((url_associations_key && g_win32_registry_key_has_changed (url_associations_key)) || if (g_atomic_int_get (&gio_win32_appinfo_update_counter) > 0)
(file_exts_key && g_win32_registry_key_has_changed (file_exts_key)) ||
(user_clients_key && g_win32_registry_key_has_changed (user_clients_key)) ||
(system_clients_key && g_win32_registry_key_has_changed (system_clients_key)) ||
(applications_key && g_win32_registry_key_has_changed (applications_key)) ||
(user_registered_apps_key && g_win32_registry_key_has_changed (user_registered_apps_key)) ||
(system_registered_apps_key && g_win32_registry_key_has_changed (system_registered_apps_key)) ||
(classes_root_key && g_win32_registry_key_has_changed (classes_root_key)))
{ {
g_mutex_lock (&gio_win32_appinfo_mutex); g_mutex_lock (&gio_win32_appinfo_mutex);
while (g_atomic_int_get (&gio_win32_appinfo_update_counter) > 0) while (g_atomic_int_get (&gio_win32_appinfo_update_counter) > 0)