Move SigWinch handling before refresh in menus.

This will prevent an unneeded double-refresh after an endwin() when we
set SigWinch in the next commit.

In the pager, change RETWINCH handling to account for a sigwinch while
in the handler.  Previously a redraw would occur and use/free the
Resize data, but since the SigWinch check now occurs before the
redraw, keep existing data.

1 files changed, 14 insertions, 10 deletions

diff --git a/menu.c b/menu.c
index 52198f9a..f83356c4 100644
--- a/menu.c
+++ b/menu.c
@@ -1047,6 +1047,20 @@ int mutt_menuLoop (MUTTMENU *menu)
 
     mutt_curs_set (0);
 
+#if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM)
+    if (SigWinch)
+    {
+      do
+      {
+        SigWinch = 0;
+        mutt_resize_screen ();
+      }
+      while (SigWinch);
+
+      clearok(stdscr,TRUE);/*force complete redraw*/
+    }
+#endif
+
     if (menu->custom_menu_update)
       menu->custom_menu_update (menu);
 
@@ -1074,16 +1088,6 @@ int mutt_menuLoop (MUTTMENU *menu)
 
     mutt_refresh ();
 
-#if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM)
-    if (SigWinch)
-    {
-      SigWinch = 0;
-      mutt_resize_screen ();
-      clearok(stdscr,TRUE);/*force complete redraw*/
-      continue;
-    }
-#endif
-
     /* try to catch dialog keys before ops */
     if (menu->dialog && menu_dialog_dokey (menu, &i) == 0)
       return i;