From bbd5a7b29c3dd3d3179b48f8e7ef368d45451253 Mon Sep 17 00:00:00 2001 From: monsta Date: Sun, 12 May 2019 13:09:49 +0300 Subject: fix reloading the default layout after panel reset - do it in the idle handler - wait until all toplevels are destroyed before reloading the layout --- mate-panel/panel-profile.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/mate-panel/panel-profile.c b/mate-panel/panel-profile.c index 79415460..7d787755 100644 --- a/mate-panel/panel-profile.c +++ b/mate-panel/panel-profile.c @@ -1435,6 +1435,18 @@ panel_profile_delete_removed_ids (PanelGSettingsKeyType type, g_slist_free (removed_ids); } +static gboolean +load_default_layout_idle (gpointer unused) { + if (g_slist_length (panel_toplevel_list_toplevels ()) != 0) { + /* some toplevels are not destroyed yet, waiting */ + return TRUE; + } + + /* load the default layout and stop this handler */ + panel_profile_ensure_toplevel_per_screen (); + return FALSE; +} + static void panel_profile_toplevel_id_list_notify (GSettings *settings, gchar *key, @@ -1477,7 +1489,7 @@ panel_profile_toplevel_id_list_notify (GSettings *settings, /* if there are no panels, reset layout to default */ if (g_slist_length (toplevel_ids) == 0) - panel_profile_ensure_toplevel_per_screen (); + g_idle_add (load_default_layout_idle, NULL); g_slist_free (existing_toplevels); g_slist_free (toplevel_ids); -- cgit v1.2.1