From 775800f76e800979d3ff91ff2e78b7149ff6a960 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 15 Aug 2015 23:38:20 -0400 Subject: [PATCH] popover: Don't restore stale default widget Only restore the saved default widget if the default hasn't been changed while the popover was visible. --- gtk/gtkpopover.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c index 67697751de..aa36ab564c 100644 --- a/gtk/gtkpopover.c +++ b/gtk/gtkpopover.c @@ -610,7 +610,8 @@ gtk_popover_unmap (GtkWidget *widget) gdk_window_hide (gtk_widget_get_window (widget)); GTK_WIDGET_CLASS (gtk_popover_parent_class)->unmap (widget); - gtk_window_set_default (priv->window, priv->prev_default); + if (gtk_window_get_default_widget (priv->window) == priv->default_widget) + gtk_window_set_default (priv->window, priv->prev_default); g_clear_object (&priv->prev_default); }