Merge branch 'fix-win32-app-info-registry-key-assert' into 'main'

GWin32AppInfo: Do not assert about successful open'ing of registry keys

See merge request GNOME/glib!2260
This commit is contained in:
Philip Withnall 2021-11-01 10:41:31 +00:00
commit e4bb09d8ec

View File

@ -983,7 +983,10 @@ get_verbs (GWin32RegistryKey *program_id_key,
name,
NULL);
g_assert (subkey != NULL);
/* We may not have the required access rights to open the child key */
if (subkey == NULL)
continue;
/* The key we're looking at is "<some_root>/Shell/<this_key>",
* where "Shell" is verbshell_prefix.
* If it has a value named 'Subcommands' (doesn't matter what its data is),