From aff2e261a7331f35fa7821fd9b524e217723c2fb Mon Sep 17 00:00:00 2001
From: Victor Kareh <vkareh@redhat.com>
Date: Tue, 21 May 2019 14:15:37 -0400
Subject: fix a crash-on-exit

meta_frames_destroy() was not safe to be called multiple times, which
was causing a crash on exit due to something else changing somewhere
that makes it get called multiple times.

https://bugzilla.gnome.org/show_bug.cgi?id=654489

upstream commit:
https://gitlab.gnome.org/GNOME/metacity/commit/e35be641
---
 src/ui/frames.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src')

diff --git a/src/ui/frames.c b/src/ui/frames.c
index 058fdb91..95f037c3 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -303,8 +303,17 @@ meta_frames_destroy (GtkWidget *widget)
     }
   g_slist_free (winlist);
 
+  if (frames->normal_style)
+    {
   g_object_unref (frames->normal_style);
+      frames->normal_style = NULL;
+    }
+
+  if (frames->style_variants)
+    {
   g_hash_table_destroy (frames->style_variants);
+      frames->style_variants = NULL;
+    }
 
   GTK_WIDGET_CLASS (meta_frames_parent_class)->destroy (widget);
 }
-- 
cgit v1.2.1