isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/theme: Remove entry from files_by_stylesheet after emitting signal

Browse Source 
Since e06109c23c we keep old theme nodes
valid during the emission of the "custom-stylesheets-changed" signal.

It turns out that we might still look up the file of a stylesheet using
the files_by_stylesheet hashtable during the emission of that signal,
causing a crash because the assertion in _st_theme_resolve_url() fails.

So fix that and remove the stylesheet entry from the files_by_stylesheet
hashtable after emitting the "custom-stylesheets-changed" signal. And to
be consistent, also remove the entry from the stylesheets_by_file
hashtable after emitting the signal.

Fixes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2757
This commit is contained in:
Jonas Dreßler 2020-05-11 20:41:37 +02:00 committed by Florian Müllner
parent 9dc421875b
commit 0f947d4ff9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/st/st-theme.c
View File

@ -285,11 +285,15 @@ st_theme_unload_stylesheet (StTheme *theme,
return; return;
theme->custom_stylesheets = g_slist_remove (theme->custom_stylesheets, stylesheet); theme->custom_stylesheets = g_slist_remove (theme->custom_stylesheets, stylesheet);
g_hash_table_remove (theme->stylesheets_by_file, file);
g_hash_table_remove (theme->files_by_stylesheet, stylesheet);
g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0); g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0);
/* We need to remove the entry from the hashtable after emitting the signal
* since we might still access the files_by_stylesheet hashtable in
* _st_theme_resolve_url() during the signal emission.
*/
g_hash_table_remove (theme->stylesheets_by_file, file);
g_hash_table_remove (theme->files_by_stylesheet, stylesheet);
cr_stylesheet_unref (stylesheet); cr_stylesheet_unref (stylesheet);
} }