nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 01:02:24 +00:00
Code Issues Projects Releases Wiki Activity

Fix an embarrassing mistake in config box handling which was causing

Browse Source 
changes to any SSH bug config option to be lost when the config box
switched to a different panel, at least on GTK.

[originally from svn r9591]
This commit is contained in:
Simon Tatham 2012-07-28 16:53:09 +00:00
parent b0bb426aa7
commit 0b8753a4b9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config.c
View File

@ -529,12 +529,19 @@ static void sshbug_handler(union control *ctrl, void *dlg,
{ {
Conf *conf = (Conf *)data; Conf *conf = (Conf *)data;
if (event == EVENT_REFRESH) { if (event == EVENT_REFRESH) {
/*
* We must fetch the previously configured value from the Conf
* before we start modifying the drop-down list, otherwise the
* spurious SELCHANGE we trigger in the process will overwrite
* the value we wanted to keep.
*/
int oldconf = conf_get_int(conf, ctrl->listbox.context.i);
dlg_update_start(ctrl, dlg); dlg_update_start(ctrl, dlg);
dlg_listbox_clear(ctrl, dlg); dlg_listbox_clear(ctrl, dlg);
dlg_listbox_addwithid(ctrl, dlg, "Auto", AUTO); dlg_listbox_addwithid(ctrl, dlg, "Auto", AUTO);
dlg_listbox_addwithid(ctrl, dlg, "Off", FORCE_OFF); dlg_listbox_addwithid(ctrl, dlg, "Off", FORCE_OFF);
dlg_listbox_addwithid(ctrl, dlg, "On", FORCE_ON); dlg_listbox_addwithid(ctrl, dlg, "On", FORCE_ON);
switch (conf_get_int(conf, ctrl->listbox.context.i)) { switch (oldconf) {
case AUTO: dlg_listbox_select(ctrl, dlg, 0); break; case AUTO: dlg_listbox_select(ctrl, dlg, 0); break;
case FORCE_OFF: dlg_listbox_select(ctrl, dlg, 1); break; case FORCE_OFF: dlg_listbox_select(ctrl, dlg, 1); break;
case FORCE_ON: dlg_listbox_select(ctrl, dlg, 2); break; case FORCE_ON: dlg_listbox_select(ctrl, dlg, 2); break;