Fix #155

JesseTG · Jun 12, 2024 · 4a835ff · 4a835ff
1 parent 6667266
commit 4a835ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/libretro/core/core.cpp b/src/libretro/core/core.cpp
@@ -316,15 +316,15 @@ bool MelonDsDs::CoreState::InitErrorScreen(const config_exception& e) noexcept {
     retro::task::reset();
     _messageScreen = std::make_unique<error::ErrorScreen>(e);
     Config.SetConfiguredRenderer(RenderMode::Software);
+    _renderState.Apply(Config);
+    _screenLayout.Apply(Config, _renderState);
     _screenLayout.Update();
     retro::error("Error screen initialized");
     return true;
 }
 
 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
@@ -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
+)