X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/640d73877e44394a3c12c0aa2cf023c543933032..2ff340bdd3941537211af374feaa6023a20529be:/sercfg.c

diff --git a/sercfg.c b/sercfg.c
index 752953e5..fc267370 100644
--- a/sercfg.c
+++ b/sercfg.c
@@ -34,6 +34,7 @@ static void serial_parity_handler(union control *ctrl, void *dlg,
     Config *cfg = (Config *)data;
 
     if (event == EVENT_REFRESH) {
+	int oldparity = cfg->serparity;/* preserve past reentrant calls */
 	dlg_update_start(ctrl, dlg);
 	dlg_listbox_clear(ctrl, dlg);
 	for (i = 0; i < lenof(parities); i++)  {
@@ -42,12 +43,20 @@ static void serial_parity_handler(union control *ctrl, void *dlg,
 				      parities[i].val);
 	}
 	for (i = j = 0; i < lenof(parities); i++) {
-	    if (cfg->serparity == parities[i].val)
-		dlg_listbox_select(ctrl, dlg, j);
-	    if (mask & (1 << i))
+	    if (mask & (1 << i)) {
+		if (oldparity == parities[i].val) {
+		    dlg_listbox_select(ctrl, dlg, j);
+		    break;
+		}
 		j++;
+	    }
+	}
+	if (i == lenof(parities)) {    /* an unsupported setting was chosen */
+	    dlg_listbox_select(ctrl, dlg, 0);
+	    oldparity = SER_PAR_NONE;
 	}
 	dlg_update_done(ctrl, dlg);
+	cfg->serparity = oldparity;    /* restore */
     } else if (event == EVENT_SELCHANGE) {
 	int i = dlg_listbox_index(ctrl, dlg);
 	if (i < 0)
@@ -75,6 +84,7 @@ static void serial_flow_handler(union control *ctrl, void *dlg,
     Config *cfg = (Config *)data;
 
     if (event == EVENT_REFRESH) {
+	int oldflow = cfg->serflow;    /* preserve past reentrant calls */
 	dlg_update_start(ctrl, dlg);
 	dlg_listbox_clear(ctrl, dlg);
 	for (i = 0; i < lenof(flows); i++)  {
@@ -82,16 +92,24 @@ static void serial_flow_handler(union control *ctrl, void *dlg,
 		dlg_listbox_addwithid(ctrl, dlg, flows[i].name, flows[i].val);
 	}
 	for (i = j = 0; i < lenof(flows); i++) {
-	    if (cfg->serflow == flows[i].val)
-		dlg_listbox_select(ctrl, dlg, j);
-	    if (mask & (1 << i))
+	    if (mask & (1 << i)) {
+		if (oldflow == flows[i].val) {
+		    dlg_listbox_select(ctrl, dlg, j);
+		    break;
+		}
 		j++;
+	    }
+	}
+	if (i == lenof(flows)) {       /* an unsupported setting was chosen */
+	    dlg_listbox_select(ctrl, dlg, 0);
+	    oldflow = SER_FLOW_NONE;
 	}
 	dlg_update_done(ctrl, dlg);
+	cfg->serflow = oldflow;	       /* restore */
     } else if (event == EVENT_SELCHANGE) {
 	int i = dlg_listbox_index(ctrl, dlg);
 	if (i < 0)
-	    i = SER_PAR_NONE;
+	    i = SER_FLOW_NONE;
 	else
 	    i = dlg_listbox_getid(ctrl, dlg, i);
 	cfg->serflow = i;
@@ -104,16 +122,18 @@ void ser_setup_config_box(struct controlbox *b, int midsession,
     struct controlset *s;
     union control *c;
 
-    /*
-     * Add the serial back end to the protocols list at the top of
-     * the config box.
-     */
-    s = ctrl_getset(b, "Session", "hostport",
-		    "Specify your connection by host name or IP address");
-    {
+    if (!midsession) {
 	int i;
 	extern void config_protocolbuttons_handler(union control *, void *,
 						   void *, int);
+
+	/*
+	 * Add the serial back end to the protocols list at the
+	 * top of the config box.
+	 */
+	s = ctrl_getset(b, "Session", "hostport",
+			"Specify the destination you want to connect to");
+
         for (i = 0; i < s->ncontrols; i++) {
             c = s->ctrls[i];
 	    if (c->generic.type == CTRL_RADIO &&
@@ -130,7 +150,7 @@ void ser_setup_config_box(struct controlbox *b, int midsession,
 		if (c->radio.shortcuts) {
 		    c->radio.shortcuts =
 			sresize(c->radio.shortcuts, c->radio.nbuttons, char);
-		    c->radio.shortcuts[c->radio.nbuttons-1] = NO_SHORTCUT;
+		    c->radio.shortcuts[c->radio.nbuttons-1] = 'r';
 		}
 	    }
 	}