summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShantanu Goel <sgoel01@yahoo.com>2017-03-18 21:10:45 -0400
committerAlberts Muktupāvels <alberts.muktupavels@gmail.com>2017-04-04 21:19:38 +0300
commitbbe29f4bbfa553ad3e82bb710d33a29dcd667f34 (patch)
tree0fbb18500f8438d1ad32581f4fbd545f296e20b8
parent64e95c2ec2a1669da2ddab6c29108d718f79dfff (diff)
downloadmetacity-gnome-3-18.tar.gz
frames: use correct variable in for loop assignmentgnome-3-18
update_context_styles is using the wrong variable when advancing to the next key in the hash table which can cause an infinite loop if # of variants is ever greater than 1. This problem was originally reported here: https://github.com/linuxmint/Cinnamon/issues/5254 The following patch was commited in Mint: https://github.com/linuxmint/muffin/commit/6120bdde This patch is just a shorter version of the Mint patch and they deserve all the credit for the idea. https://bugzilla.gnome.org/show_bug.cgi?id=780254
-rw-r--r--src/ui/frames.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ui/frames.c b/src/ui/frames.c
index 497e8854..e7e74204 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -205,7 +205,7 @@ update_style_contexts (MetaFrames *frames)
frames->normal_style = meta_theme_create_style_info (screen, NULL);
variants = g_hash_table_get_keys (frames->style_variants);
- for (variant = variants; variant; variant = variants->next)
+ for (variant = variants; variant; variant = variant->next)
{
style_info = meta_theme_create_style_info (screen, (char *)variant->data);
g_hash_table_insert (frames->style_variants,