X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/dfca2656cd4ff9f9cad27ddd418383949a729e65..66ee282adab99e6ef6ab7e09700611c89d87c97c:/window.c

diff --git a/window.c b/window.c
index f3db0cd3..f0973595 100644
--- a/window.c
+++ b/window.c
@@ -706,7 +706,8 @@ char *do_select(SOCKET skt, int startup)
     int msg, events;
     if (startup) {
 	msg = WM_NETEVENT;
-	events = FD_READ | FD_WRITE | FD_OOB | FD_CLOSE | FD_ACCEPT;
+	events = (FD_CONNECT | FD_READ | FD_WRITE |
+		  FD_OOB | FD_CLOSE | FD_ACCEPT);
     } else {
 	msg = events = 0;
     }
@@ -1666,6 +1667,9 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	pending_netevent = TRUE;
 	pend_netevent_wParam = wParam;
 	pend_netevent_lParam = lParam;
+	if (WSAGETSELECTEVENT(lParam) != FD_READ)
+	    enact_pending_netevent();
+
 	time(&last_movement);
 	return 0;
       case WM_SETFOCUS:
@@ -1957,7 +1961,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	}
 	return 0;
       case WM_SETCURSOR:
-	if (send_raw_mouse) {
+	if (send_raw_mouse && LOWORD(lParam) == HTCLIENT) {
 	    SetCursor(LoadCursor(NULL, IDC_ARROW));
 	    return TRUE;
 	}