From 9ffa5db667103f086baf23c94eb05d2dd8123579 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Sun, 28 Apr 2024 22:15:07 -0400 Subject: [PATCH] Delete m_locale in the pgm_base destructor instead of manual destroy method We need the object in m_locale for a bit more things during program cleanup, especially on macOS The destructor of PGM_BASE is sufficient allowance of lifetime. Fixes https://gitlab.com/kicad/code/kicad/-/issues/17369 --- common/pgm_base.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/common/pgm_base.cpp b/common/pgm_base.cpp index 1282dfc860..41c7b13992 100644 --- a/common/pgm_base.cpp +++ b/common/pgm_base.cpp @@ -159,6 +159,9 @@ PGM_BASE::~PGM_BASE() } delete[] m_argvUtf8; + + delete m_locale; + m_locale = nullptr; } @@ -170,10 +173,6 @@ void PGM_BASE::Destroy() sentry_close(); #endif - // unlike a normal destructor, this is designed to be called more than once safely: - delete m_locale; - m_locale = nullptr; - m_pgm_checker.reset(); }