Mid-session reconfiguration of scrollback was failing (in Unix)

except when width or height had _also_ been changed. Fixed.

git-svn-id: svn://svn.tartarus.org/sgt/putty@3108 cda61777-01e9-0310-a592-d414129be87e

diff --git a/unix/pterm.c b/unix/pterm.c
index 568f517..813b157 100644 (file)
--- a/unix/pterm.c
+++ b/unix/pterm.c
@@ -2519,7 +2519,18 @@ void change_settings_menuitem(GtkMenuItem *item, gpointer data)
             oldcfg.window_border != cfg2.window_border || need_size) {
             set_geom_hints(inst);
             request_resize(inst, cfg2.width, cfg2.height);
-        }
+        } else {
+           /*
+            * The above will have caused a call to term_size() for
+            * us if it happened. If the user has fiddled with only
+            * the scrollback size, the above will not have
+            * happened and we will need an explicit term_size()
+            * here.
+            */
+           if (oldcfg.savelines != cfg2.savelines)
+               term_size(inst->term, inst->term->rows, inst->term->cols,
+                         cfg2.savelines);
+       }
 
         term_invalidate(inst->term);
     }