Merge pull request #85284 from Sauermann/fix-enter-hide

akien-mga · akien-mga · commit 066e7d483a8f · 2023-11-24T00:01:15.000+01:00
Fix crash when hiding a Control during mouse-entering
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
@@ -3207,7 +3207,9 @@ void Viewport::_update_mouse_over(Vector2 p_pos) {
 			}
 
 			// Send Mouse Enter Self notification.
-			gui.mouse_over->notification(Control::NOTIFICATION_MOUSE_ENTER_SELF);
+			if (gui.mouse_over) {
+				gui.mouse_over->notification(Control::NOTIFICATION_MOUSE_ENTER_SELF);
+			}
 
 			notify_embedded_viewports = true;
 		}

Original file line number	Diff line number	Diff line change
`@@ -3207,7 +3207,9 @@ void Viewport::_update_mouse_over(Vector2 p_pos) {`
`3207`	`3207`	`}`
`3208`	`3208`
`3209`	`3209`	`// Send Mouse Enter Self notification.`
`3210`		`- gui.mouse_over->notification(Control::NOTIFICATION_MOUSE_ENTER_SELF);`
	`3210`	`+ if (gui.mouse_over) {`
	`3211`	`+ gui.mouse_over->notification(Control::NOTIFICATION_MOUSE_ENTER_SELF);`
	`3212`	`+ }`
`3211`	`3213`
`3212`	`3214`	`notify_embedded_viewports = true;`
`3213`	`3215`	`}`