[Scummvm-git-logs] scummvm master -> f94b7267170324bc6795df5e6e0cfbe5d29aac91

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
f94b726717 BAGEL: METAGAME: Fix crash leaving Grand Tour top 10 dialog


Commit: f94b7267170324bc6795df5e6e0cfbe5d29aac91
    https://github.com/scummvm/scummvm/commit/f94b7267170324bc6795df5e6e0cfbe5d29aac91
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-26T23:42:00-07:00

Commit Message:
BAGEL: METAGAME: Fix crash leaving Grand Tour top 10 dialog

Changed paths:
    engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp


diff --git a/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp b/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
index ccfa78f4c71..af239b8510a 100644
--- a/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
+++ b/engines/bagel/hodjnpodj/metagame/grand_tour/grand_tour.cpp
@@ -912,12 +912,12 @@ void CMainGTWindow::SplashScreen() {
  ****************************************************************/
 bool CMainGTWindow::OnCommand(WPARAM wParam, LPARAM lParam) {
 	// Redraw rect for Hodj/Podj difficulties
-	const RECT r11 = pHSHButton->GetWindowRectInParentCoords();
-	const RECT r12 = pPSNPButton->GetWindowRectInParentCoords();
+	const CRect r11 = pHSHButton ? pHSHButton->GetWindowRectInParentCoords() : CRect();
+	const CRect r12 = pPSNPButton ? pPSNPButton->GetWindowRectInParentCoords() : CRect();
 	const CRect cRect1(r11.left, r11.top, r12.right, r12.bottom);
 	// Redraw rect for Game Order and everything below it
-	const RECT r21 = pGAButton->GetWindowRectInParentCoords();
-	const RECT r22 = pLeaveButton->GetWindowRectInParentCoords();
+	const CRect r21 = pGAButton ? pGAButton->GetWindowRectInParentCoords() : CRect();
+	const CRect r22 = pLeaveButton ? pLeaveButton->GetWindowRectInParentCoords() : CRect();
 	const CRect cRect2(r21.left, r21.top, r22.right, r22.bottom);
 
 	if (HIWORD(lParam) == BN_CLICKED) {