[gtk/matthiasc/for-master: 1/3] window: Fix an oversight

[Matthias Clasen <matthiasc src gnome org>]

commit 17710709f98731d9d70ec63f9162292fa5f3fcc7
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Aug 10 10:51:47 2020 -0400

    window: Fix an oversight
    
    Commit 658719a205bfcf moved the call to
    gtk_window_compute_default_size() outside the
    if (priv->needs_default_size)
    but unfortunately, that function cleared that field,
    so we never entered the branch.
    
    Keep the setting of priv->needs_default_size in the
    branch, where it belongs.

 gtk/gtkwindow.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index d84729442f..031a280b19 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -4222,7 +4222,6 @@ gtk_window_compute_default_size (GtkWindow *window,
                                  int       *width,
                                  int       *height)
 {
-  GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
   GtkWidget *widget = GTK_WIDGET (window);
 
   *width = max_width;
@@ -4257,9 +4256,6 @@ gtk_window_compute_default_size (GtkWindow *window,
                           NULL, NULL);
       *height = MAX (minimum, MIN (*height, natural));
     }
-
-  /* No longer use the default settings */
-  priv->need_default_size = FALSE;
 }
 
 static void
@@ -4288,6 +4284,10 @@ toplevel_compute_size (GdkToplevel     *toplevel,
     {
       int remembered_width;
       int remembered_height;
+
+      /* No longer use the default settings */
+      priv->need_default_size = FALSE;
+
       gtk_window_get_remembered_size (window,
                                       &remembered_width, &remembered_height);
       width = MAX (default_width, remembered_width);