From 2b97b774663b44c86eb3f8029d690bbe9a433ec8 Mon Sep 17 00:00:00 2001 From: littleblack111 Date: Wed, 2 Apr 2025 21:46:41 +0800 Subject: fix: nullptr(SEGEV) during shutdown --- src/renderManager.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src/renderManager.cpp') diff --git a/src/renderManager.cpp b/src/renderManager.cpp index c103285..84896a1 100644 --- a/src/renderManager.cpp +++ b/src/renderManager.cpp @@ -3,8 +3,10 @@ CRenderManager::CRenderManager() : screen(ftxui::ScreenInteractive::TerminalOutput()) { - if (std::atexit([]() { g_pRenderManager->exitLoop(); })) - log(ERR, "Failed to register SessionManager atexit handler, will fallback to quick_exit after hang"); + if (std::atexit([]() { + if (g_pRenderManager) g_pRenderManager->exitLoop(); + })) + log(ERR, "Failed to register RenderManager atexit handler, will fallback to quick_exit after hang"); log(LOG, "RenderManager: initialized"); }; @@ -14,8 +16,16 @@ CRenderManager::~CRenderManager() { } void CRenderManager::exitLoop() { - screen.ExitLoopClosure()(); - screen.Exit(); + if (renderer) { + try { + screen.ExitLoopClosure()(); + screen.Exit(); + } catch (const std::exception& e) { + log(WARN, "Exception in exitLoop: {}", e.what()); + } catch (...) { + log(WARN, "Unknown exception in exitLoop"); + } + } } void CRenderManager::enterLoop() { -- cgit v1.2.3