nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-16 12:03:03 -05:00
Code Issues Projects Releases Wiki Activity

Make the colour list failsafe. Patch due to Robert de Bath

Browse Source 
[originally from svn r837]
This commit is contained in:
Simon Tatham 2001-01-07 13:39:31 +00:00
parent 826a464682
commit 93004c40ad
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
windlg.c
View File

@ -519,7 +519,11 @@ static void init_dlg_ctrls(HWND hwnd) {
CheckDlgButton (hwnd, IDC_BOLDCOLOUR, cfg.bold_colour); CheckDlgButton (hwnd, IDC_BOLDCOLOUR, cfg.bold_colour);
CheckDlgButton (hwnd, IDC_PALETTE, cfg.try_palette); CheckDlgButton (hwnd, IDC_PALETTE, cfg.try_palette);
{ {
int i; int i, n;
n = SendDlgItemMessage (hwnd, IDC_COLOURLIST, LB_GETCOUNT, 0, 0);
for (i=n; i-- >0 ;)
SendDlgItemMessage (hwnd, IDC_COLOURLIST,
LB_DELETESTRING, i, 0);
for (i=0; i<22; i++) for (i=0; i<22; i++)
if (cfg.bold_colour || permcolour[i]) if (cfg.bold_colour || permcolour[i])
SendDlgItemMessage (hwnd, IDC_COLOURLIST, LB_ADDSTRING, 0, SendDlgItemMessage (hwnd, IDC_COLOURLIST, LB_ADDSTRING, 0,
@ -1613,17 +1617,15 @@ static int GenericMainDlgProc (HWND hwnd, UINT msg,
int n, i; int n, i;
cfg.bold_colour = IsDlgButtonChecked (hwnd, IDC_BOLDCOLOUR); cfg.bold_colour = IsDlgButtonChecked (hwnd, IDC_BOLDCOLOUR);
n = SendDlgItemMessage (hwnd, IDC_COLOURLIST, LB_GETCOUNT, 0, 0); n = SendDlgItemMessage (hwnd, IDC_COLOURLIST, LB_GETCOUNT, 0, 0);
if (cfg.bold_colour && n!=22) { if (n != 12+10*cfg.bold_colour) {
for (i=0; i<22; i++) for (i=n; i-- >0 ;)
if (!permcolour[i]) SendDlgItemMessage (hwnd, IDC_COLOURLIST,
SendDlgItemMessage (hwnd, IDC_COLOURLIST,
LB_INSERTSTRING, i,
(LPARAM) colours[i]);
} else if (!cfg.bold_colour && n!=12) {
for (i=22; i-- ;)
if (!permcolour[i])
SendDlgItemMessage (hwnd, IDC_COLOURLIST,
LB_DELETESTRING, i, 0); LB_DELETESTRING, i, 0);
for (i=0; i<22; i++)
if (cfg.bold_colour || permcolour[i])
SendDlgItemMessage (hwnd, IDC_COLOURLIST,
LB_ADDSTRING, 0,
(LPARAM) colours[i]);
} }
} }
break; break;