X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/f8a28d1f902b5430c33a619094d62ae2f4274f3b..6edd7346879373ad77b27867587b0421fd82fc13:/windlg.c

diff --git a/windlg.c b/windlg.c
index 1e5a6322..07e34bb6 100644
--- a/windlg.c
+++ b/windlg.c
@@ -663,6 +663,7 @@ static void init_dlg_ctrls(HWND hwnd, int keepsess)
 		     IDC_LSTATXAPN);
     {
 	char *p = cfg.environmt;
+	SendDlgItemMessage(hwnd, IDV_ENVLIST, LB_RESETCONTENT, 0, 0);
 	while (*p) {
 	    SendDlgItemMessage(hwnd, IDC_ENVLIST, LB_ADDSTRING, 0,
 			       (LPARAM) p);
@@ -2426,8 +2427,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
     }
     if (msg == WM_COMMAND && LOWORD(wParam) == IDCX_ABOUT) {
 	EnableWindow(hwnd, 0);
-	DialogBox(hinst, MAKEINTRESOURCE(IDD_ABOUTBOX),
-		  GetParent(hwnd), AboutProc);
+	DialogBox(hinst, MAKEINTRESOURCE(IDD_ABOUTBOX), hwnd, AboutProc);
 	EnableWindow(hwnd, 1);
 	SetActiveWindow(hwnd);
     }
@@ -2452,6 +2452,7 @@ void defuse_showwindow(void)
 	hwnd = CreateDialog(hinst, MAKEINTRESOURCE(IDD_ABOUTBOX),
 			    NULL, NullDlgProc);
 	ShowWindow(hwnd, SW_HIDE);
+	SetActiveWindow(hwnd);
 	DestroyWindow(hwnd);
     }
 }