From 955b27637c6be1d9d3996e4cae96390381e6bbfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Fri, 1 Nov 2019 13:15:57 +0100 Subject: [PATCH] plugin/default: Init quark before using Cut lines in pieces, and remove useless "optimizations" while at it https://gitlab.gnome.org/GNOME/mutter/merge_requests/912 --- src/compositor/plugins/default.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/compositor/plugins/default.c b/src/compositor/plugins/default.c index e7203ee11..42d28ec20 100644 --- a/src/compositor/plugins/default.c +++ b/src/compositor/plugins/default.c @@ -750,12 +750,17 @@ free_display_tile_preview (gpointer data) static DisplayTilePreview * get_display_tile_preview (MetaDisplay *display) { - DisplayTilePreview *preview = g_object_get_qdata (G_OBJECT (display), display_tile_preview_data_quark); + DisplayTilePreview *preview; - if (G_UNLIKELY (display_tile_preview_data_quark == 0)) - display_tile_preview_data_quark = g_quark_from_static_string (DISPLAY_TILE_PREVIEW_DATA_KEY); + if (!display_tile_preview_data_quark) + { + display_tile_preview_data_quark = + g_quark_from_static_string (DISPLAY_TILE_PREVIEW_DATA_KEY); + } - if (G_UNLIKELY (!preview)) + preview = g_object_get_qdata (G_OBJECT (display), + display_tile_preview_data_quark); + if (!preview) { preview = g_slice_new0 (DisplayTilePreview);