Index: dll/cpl/desk/general.c =================================================================== --- dll/cpl/desk/general.c (revision 71259) +++ dll/cpl/desk/general.c (working copy) @@ -39,34 +39,35 @@ } RegCloseKey(hKey); - } - for (;;) - { - TCHAR Buffer[LINE_LEN]; - TCHAR Desc[LINE_LEN]; - if (SetupGetStringField(&Context, 0, Buffer, sizeof(Buffer) / sizeof(TCHAR), NULL) && - SetupGetIntField(&Context, 1, &ci)) + for (;;) { - _stprintf(Desc, _T("%s (%d DPI)"), Buffer, ci); - i = SendMessage(hFontSize, CB_ADDSTRING, 0, (LPARAM)Desc); - if (i != CB_ERR) - SendMessage(hFontSize, CB_SETITEMDATA, (WPARAM)i, (LPARAM)ci); - - if ((int)dwValue == ci) + TCHAR Buffer[LINE_LEN]; + TCHAR Desc[LINE_LEN]; + + if (SetupGetStringField(&Context, 0, Buffer, sizeof(Buffer) / sizeof(TCHAR), NULL) && + SetupGetIntField(&Context, 1, &ci)) { - SendMessage(hFontSize, CB_SETCURSEL, (WPARAM)i, 0); - SetWindowText(GetDlgItem(hWnd, IDC_FONTSIZE_CUSTOM), Desc); + _stprintf(Desc, _T("%s (%d DPI)"), Buffer, ci); + i = SendMessage(hFontSize, CB_ADDSTRING, 0, (LPARAM)Desc); + if (i != CB_ERR) + SendMessage(hFontSize, CB_SETITEMDATA, (WPARAM)i, (LPARAM)ci); + + if ((int)dwValue == ci) + { + SendMessage(hFontSize, CB_SETCURSEL, (WPARAM)i, 0); + SetWindowText(GetDlgItem(hWnd, IDC_FONTSIZE_CUSTOM), Desc); + } + else + SendMessage(hFontSize, CB_SETCURSEL, 0, 0); } - else - SendMessage(hFontSize, CB_SETCURSEL, 0, 0); + + if (!SetupFindNextLine(&Context, &Context)) + { + break; + } } - - if (!SetupFindNextLine(&Context, &Context)) - { - break; - } } } }