From 454311fd289bb03b0060802fce57aa4ee3c100f9 Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 19 Apr 2025 10:27:51 +0200 Subject: [PATCH] fix titlescreen demos crashing, again --- src/g_game.c | 13 ++++++------- src/m_menu.c | 8 +------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/g_game.c b/src/g_game.c index 00792bf96..2b6cb07cf 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -8109,16 +8109,15 @@ boolean G_CheckDemoStatus(void) { G_ExitLevel(); } + else if (modeattacking && !demo.title) // nooo dont crash our titledemos + { + G_StopDemo(); + M_EndModeAttackRun(); + } else { - UINT8 wasmodeattacking = modeattacking; - G_StopDemo(); - - if (wasmodeattacking) - M_EndModeAttackRun(); - else - D_StartTitle(); + D_StartTitle(); } return true; diff --git a/src/m_menu.c b/src/m_menu.c index 3024d28d7..dba648120 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -9501,13 +9501,7 @@ static void M_ModeAttackEndGame(INT32 choice) Command_ExitGame_f(); M_StartControlPanel(); - switch(modeattacking) - { - default: - case ATTACKING_RECORD: - currentMenu = &SP_TimeAttackDef; - break; - } + currentMenu = &SP_TimeAttackDef; itemOn = currentMenu->lastOn; G_SetGamestate(GS_TIMEATTACK); modeattacking = ATTACKING_NONE;