Merge pull request #5452 from montegoulding/bugfix-19620

livecodepanos · web-flow · commit 5fbaa96e984d · 2017-05-12T10:18:50.000+01:00
[Bug 19620] Update cursor when entering window
diff --git a/docs/notes/bugfix-19620.md b/docs/notes/bugfix-19620.md
@@ -0,0 +1 @@
+# Update cursor when entering window on windows
diff --git a/engine/src/w32dcw32.cpp b/engine/src/w32dcw32.cpp
@@ -1108,7 +1108,7 @@ LRESULT CALLBACK MCWindowProc(HWND hwnd, UINT msg, WPARAM wParam,
 		if (curinfo->live && !pms->isgrabbed() && LOWORD(lParam) != HTCLIENT)
 			return IsWindowUnicode(hwnd) ? DefWindowProcW(hwnd, msg, wParam, lParam) : DefWindowProcA(hwnd, msg, wParam, lParam);
 		MCmousestackptr = MCdispatcher->findstackd(dw);
-		if (!MCmousestackptr)
+		if (MCmousestackptr)
 		{
 			MCmousestackptr->resetcursor(True);
 			if (pms->getmousetimer() == 0)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Update cursor when entering window on windows`
Original file line number	Diff line number	Diff line change
`@@ -1108,7 +1108,7 @@ LRESULT CALLBACK MCWindowProc(HWND hwnd, UINT msg, WPARAM wParam,`
`1108`	`1108`	`if (curinfo->live && !pms->isgrabbed() && LOWORD(lParam) != HTCLIENT)`
`1109`	`1109`	`return IsWindowUnicode(hwnd) ? DefWindowProcW(hwnd, msg, wParam, lParam) : DefWindowProcA(hwnd, msg, wParam, lParam);`
`1110`	`1110`	`MCmousestackptr = MCdispatcher->findstackd(dw);`
`1111`		`- if (!MCmousestackptr)`
	`1111`	`+ if (MCmousestackptr)`
`1112`	`1112`	`{`
`1113`	`1113`	`MCmousestackptr->resetcursor(True);`
`1114`	`1114`	`if (pms->getmousetimer() == 0)`