From dc0ca964f2bb278fadaf411d2977208ca78acaf9 Mon Sep 17 00:00:00 2001 From: Jesse Talavera Date: Fri, 31 May 2024 12:07:45 -0400 Subject: [PATCH] Fix #155 --- src/libretro/core/core.cpp | 4 ++-- test/cmake/Video.cmake | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libretro/core/core.cpp b/src/libretro/core/core.cpp index c3412db3..21d92e28 100644 --- a/src/libretro/core/core.cpp +++ b/src/libretro/core/core.cpp @@ -316,6 +316,8 @@ bool MelonDsDs::CoreState::InitErrorScreen(const config_exception& e) noexcept { retro::task::reset(); _messageScreen = std::make_unique(e); Config.SetConfiguredRenderer(RenderMode::Software); + _renderState.Apply(Config); + _screenLayout.Apply(Config, _renderState); _screenLayout.Update(); retro::error("Error screen initialized"); return true; @@ -323,8 +325,6 @@ bool MelonDsDs::CoreState::InitErrorScreen(const config_exception& e) noexcept { void MelonDsDs::CoreState::RenderErrorScreen() noexcept { assert(_messageScreen != nullptr); - - _screenLayout.Update(); _renderState.Render(*_messageScreen, Config, _screenLayout); } diff --git a/test/cmake/Video.cmake b/test/cmake/Video.cmake index 9c833ebd..410dbfbb 100644 --- a/test/cmake/Video.cmake +++ b/test/cmake/Video.cmake @@ -68,9 +68,8 @@ add_python_test( # See https://github.com/JesseTG/melonds-ds/issues/155 add_python_test( NAME "Core does not crash at in-core error screen when using OpenGL" - TEST_MODULE "" - CONTENT "${NDS_ROM}" + TEST_MODULE basics.core_run_frames CORE_OPTION "melonds_render_mode=opengl" REQUIRES_OPENGL - DISABLED -) # TODO: Implement + NO_SKIP_ERROR_SCREEN +)