[Scummvm-git-logs] scummvm master -> 5125d0e863d2d463d15081a71c0d0331af9f815d

[dreammaster]

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

Summary:
bb00b78133 BAGEL: METAGAME: Remove deprecated ifdef block
5125d0e863 BAGEL: METAGAME: Fix crash if quitting when exiting minigame to boardgame


Commit: bb00b78133ae40ce4f853843e6ce966a74420029
    https://github.com/scummvm/scummvm/commit/bb00b78133ae40ce4f853843e6ce966a74420029
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-29T01:52:02-07:00

Commit Message:
BAGEL: METAGAME: Remove deprecated ifdef block

Changed paths:
    engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
    engines/bagel/hodjnpodj/metagame/gtl/init.cpp


diff --git a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
index fe605a59387..de1e3589a81 100644
--- a/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
+++ b/engines/bagel/hodjnpodj/metagame/frame/hodjpodj.cpp
@@ -861,7 +861,6 @@ void    CHodjPodjWindow::LoadNewDLL(LPARAM lParam) {
 	CWinApp *pMyApp;
 
 	pMyApp = AfxGetApp();
-
 	nWhichDLL = (int)lParam;
 
 	BlackScreen();
diff --git a/engines/bagel/hodjnpodj/metagame/gtl/init.cpp b/engines/bagel/hodjnpodj/metagame/gtl/init.cpp
index 490f7476751..ae9ccfacd52 100644
--- a/engines/bagel/hodjnpodj/metagame/gtl/init.cpp
+++ b/engines/bagel/hodjnpodj/metagame/gtl/init.cpp
@@ -89,43 +89,8 @@ HWND FAR PASCAL RunMeta(HWND hParentWnd, CBfcMgr *lpBfcMgr, bool bMetaLoaded) {
 	theApp->InitInstance();
 	theApp->setKeybinder(KeybindToKeycode);
 
-	#if RETAIN_META_DLL
-	if (bMetaLoaded) {
-		CGtlView    *xpGtlFocusView, *xpGtlMouseView;
-		CGtlDoc     *xpGtlDoc = nullptr;
-
-		pMainWindow->GetCurrentDocAndView(xpGtlDoc, xpGtlFocusView, xpGtlMouseView) ;
-		xpGtlDoc->m_xpGtlData->m_xpGtlView->SetTimer(ANIMATION_TIMER_ID, ANIMATION_TIMER_INTERVAL, nullptr);
-		if (lpBfcMgr->m_bRestart == false) {
-			xpGtlDoc->m_xpGtlData->m_xpXodjChain = nullptr;
-			xpGtlDoc->m_xpGtlData->m_xpCurXodj = nullptr;
-			xpGtlDoc->m_xpGtlData->m_iMishMoshLoc = 0;
-			pMainWindow->m_lpBfcMgr = nullptr;
-			pMainWindow->m_lpBfcMgr = lpBfcMgr;
-			xpGtlDoc->m_xpGtlData->m_bGameOver = false;
-		}
-		pMainWindow->ShowWindow(SW_SHOWNORMAL);
-		// if restoring a saved game
-		//
-		bJustReturned = true;
-		if (lpBfcMgr->m_bRestoredGame) {
-
-			// Re-init the game using the restored info (i.e. lpBfcMgr)
-			//
-			xpGtlDoc->m_xpGtlData->m_bInitMetaGame = true;
-			xpGtlDoc->m_xpGtlData->InitMetaGame(xpGtlDoc->m_xpGtlData->m_xpGtlView, true);
-
-		} else if (lpBfcMgr->m_iFunctionCode) {
-
-			xpGtlDoc->m_xpGtlData->ReturnFromInterface();
-			xpGtlDoc->m_xpGtlData->ProcessMove();
-		}
-	} else
-		SetupWindow(lpBfcMgr);
-	#else
 	bJustReturned = lpBfcMgr->m_bRestart;
 	SetupWindow(lpBfcMgr);
-	#endif
 
 	sndPlaySound(nullptr, 0);              // clear all rogue sounds
 


Commit: 5125d0e863d2d463d15081a71c0d0331af9f815d
    https://github.com/scummvm/scummvm/commit/5125d0e863d2d463d15081a71c0d0331af9f815d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-09-29T01:52:03-07:00

Commit Message:
BAGEL: METAGAME: Fix crash if quitting when exiting minigame to boardgame

Changed paths:
    engines/bagel/mfc/win_app.cpp


diff --git a/engines/bagel/mfc/win_app.cpp b/engines/bagel/mfc/win_app.cpp
index 49dc5726023..924e2e71333 100644
--- a/engines/bagel/mfc/win_app.cpp
+++ b/engines/bagel/mfc/win_app.cpp
@@ -152,6 +152,9 @@ bool CWinApp::SaveAllModified() {
 }
 
 int CWinApp::Run() {
+	if (isQuitting())
+		return 0;
+
 	// Ensure app has been initialized
 	assert(_defaultFont.font());