Mercurial > octave
changeset 27219:b88d66c631c8
delete translator objects in base_qobject destructor
* octave-qobject.cc (base_qobject::~base_qobject):
Also delete m_qsci_tr, m_gui_tr, and m_qt_tr objects.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 28 Jun 2019 17:03:28 -0400 |
| parents | a044202208af |
| children | 9a4a9fcc186b |
| files | libgui/src/main-window.cc libgui/src/octave-qobject.cc |
| diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/src/main-window.cc Fri Jun 28 14:42:44 2019 -0400 +++ b/libgui/src/main-window.cc Fri Jun 28 17:03:28 2019 -0400 @@ -215,10 +215,6 @@ main_window::~main_window (void) { - // Note that we don't delete m_main_thread here. That is handled by - // deleteLater slot that is called when the m_main_thread issues a - // finished signal. - // Destroy the terminal first so that STDERR stream is redirected back // to its original pipe to capture error messages at exit.
--- a/libgui/src/octave-qobject.cc Fri Jun 28 14:42:44 2019 -0400 +++ b/libgui/src/octave-qobject.cc Fri Jun 28 17:03:28 2019 -0400 @@ -142,7 +142,14 @@ base_qobject::~base_qobject (void) { + // Note that we don't delete m_main_thread here. That is handled by + // deleteLater slot that is called when the m_main_thread issues a + // finished signal. + delete m_interpreter_qobj; + delete m_qsci_tr; + delete m_gui_tr; + delete m_qt_tr; delete m_qapplication; string_vector::delete_c_str_vec (m_argv);