From: Timm Bäder <mail@baedert.org>
Date: Sun, 6 Oct 2019 10:13:42 +0000 (+0200)
Subject: popovermenu: Switch back to "main" AFTER unmapping
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~771
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bd9687a4f244716e7325f59fa7884a06217f860c;p=gtk4.git

popovermenu: Switch back to "main" AFTER unmapping

Otherwise we might set things to child visible etc. while being
unmapped, which is a violation of the widget invariants of these
properties.
---

diff --git a/gtk/gtkpopovermenu.c b/gtk/gtkpopovermenu.c
index 02ee7706cb..fdc053e6e4 100644
--- a/gtk/gtkpopovermenu.c
+++ b/gtk/gtkpopovermenu.c
@@ -283,8 +283,8 @@ gtk_popover_menu_map (GtkWidget *widget)
 static void
 gtk_popover_menu_unmap (GtkWidget *widget)
 {
-  gtk_popover_menu_open_submenu (GTK_POPOVER_MENU (widget), "main");
   GTK_WIDGET_CLASS (gtk_popover_menu_parent_class)->unmap (widget);
+  gtk_popover_menu_open_submenu (GTK_POPOVER_MENU (widget), "main");
 }
 
 static void