diff --git a/GPU/Common/DrawEngineCommon.cpp b/GPU/Common/DrawEngineCommon.cpp index 3035b2b58f..86f7e346ac 100644 --- a/GPU/Common/DrawEngineCommon.cpp +++ b/GPU/Common/DrawEngineCommon.cpp @@ -51,6 +51,12 @@ DrawEngineCommon::DrawEngineCommon() : decoderMap_(32) { transformedExpanded_ = (TransformedVertex *)AllocateMemoryPages(3 * TRANSFORMED_VERTEX_BUFFER_SIZE, MEM_PROT_READ | MEM_PROT_WRITE); decoded_ = (u8 *)AllocateMemoryPages(DECODED_VERTEX_BUFFER_SIZE, MEM_PROT_READ | MEM_PROT_WRITE); decIndex_ = (u16 *)AllocateMemoryPages(DECODED_INDEX_BUFFER_SIZE, MEM_PROT_READ | MEM_PROT_WRITE); + + _dbg_assert_(transformed_); + _dbg_assert_(transformedExpanded_); + _dbg_assert_(decoded_); + _dbg_assert_(decIndex_); + indexGen.Setup(decIndex_); InitDepthRaster(); diff --git a/UI/PauseScreen.cpp b/UI/PauseScreen.cpp index 7cb1da9ea3..d71607ccc2 100644 --- a/UI/PauseScreen.cpp +++ b/UI/PauseScreen.cpp @@ -376,9 +376,13 @@ GamePauseScreen::~GamePauseScreen() { } bool GamePauseScreen::UnsyncKey(const KeyInput &key) { - int retval = UIScreen::UnsyncKey(key); + bool retval = UIScreen::UnsyncKey(key); bool pauseTrigger = false; - return retval || g_controlMapper.Key(key, &pauseTrigger); + retval = g_controlMapper.Key(key, &pauseTrigger) || retval; + if (pauseTrigger) { + TriggerFinish(DR_BACK); + } + return retval; } void GamePauseScreen::UnsyncAxis(const AxisInput *axes, size_t count) {