zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-14 00:21:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed crash on returning to title screen

Browse source 
https://mantis.zdoom.org/view.php?id=615
This commit is contained in:
alexey.lysiuk 2017-04-22 09:58:38 +03:00
parent 4e1e527b2c
commit 370b639ab1
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/intermission/intermission.cpp
View file

@ -732,10 +732,6 @@ DIntermissionController::DIntermissionController(FIntermissionDescriptor *Desc,
mScreen = NULL; mScreen = NULL;
mFirst = true; mFirst = true;
mGameState = state; mGameState = state;
// If the intermission finishes straight away then cancel the wipe.
if(!NextPage())
wipegamestate = GS_FINALE;
} }
bool DIntermissionController::NextPage () bool DIntermissionController::NextPage ()
@ -898,6 +894,13 @@ void F_StartIntermission(FIntermissionDescriptor *desc, bool deleteme, uint8_t s
viewactive = false; viewactive = false;
automapactive = false; automapactive = false;
DIntermissionController::CurrentIntermission = Create<DIntermissionController>(desc, deleteme, state); DIntermissionController::CurrentIntermission = Create<DIntermissionController>(desc, deleteme, state);
// If the intermission finishes straight away then cancel the wipe.
if (!DIntermissionController::CurrentIntermission->NextPage())
{
wipegamestate = GS_FINALE;
}
GC::WriteBarrier(DIntermissionController::CurrentIntermission); GC::WriteBarrier(DIntermissionController::CurrentIntermission);
} }

1
src/intermission/intermission.h
View file

@ -304,6 +304,7 @@ public:
void OnDestroy() override; void OnDestroy() override;
friend void F_AdvanceIntermission(); friend void F_AdvanceIntermission();
friend void F_StartIntermission(FIntermissionDescriptor *, bool, uint8_t);
}; };