From f18d7169243786efbcaee6138d843728985c8194 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Fri, 11 Apr 2025 21:03:03 +0200 Subject: [PATCH] attempt at fixing plugin related allocation crashes on exit --- external/solanaceae_plugin | 2 +- src/main_screen.cpp | 1 + src/main_screen.hpp | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/external/solanaceae_plugin b/external/solanaceae_plugin index e25ee67..d03d2da 160000 --- a/external/solanaceae_plugin +++ b/external/solanaceae_plugin @@ -1 +1 @@ -Subproject commit e25ee67e4277da712504444a9d29b82eef6cbd98 +Subproject commit d03d2dae67381ab228fe0fa134756489e92b9c86 diff --git a/src/main_screen.cpp b/src/main_screen.cpp index 45577e8..d1e84ca 100644 --- a/src/main_screen.cpp +++ b/src/main_screen.cpp @@ -205,6 +205,7 @@ MainScreen::MainScreen(const SimpleConfigModel& conf_, SDL_Renderer* renderer_, } MainScreen::~MainScreen(void) { + pm.stopAll(); // TODO: quit sdl audio } diff --git a/src/main_screen.hpp b/src/main_screen.hpp index ea1d2da..5767e54 100644 --- a/src/main_screen.hpp +++ b/src/main_screen.hpp @@ -56,6 +56,8 @@ extern "C" { } // C struct MainScreen final : public Screen { + PluginManager pm; // first, so it gets destroyed last + SDL_Renderer* renderer; ObjectStore2 os; @@ -106,7 +108,6 @@ struct MainScreen final : public Screen { StreamManagerUI smui; DebugVideoTap dvt; - PluginManager pm; // last, so it gets destroyed first bool _show_tool_style_editor {false}; bool _show_tool_metrics {false};