diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-02-26 16:36:38 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 22:23:15 +0100 |
| commit | f0969f0de927e4f63ef4e111a1ffaa841f2a81ea (patch) | |
| tree | 77d208842c7e2cb361bc0f84c22be86fdb81f5b8 /dbaccess/source/ui/app | |
| parent | 532dccdc02137540dcecc5b9dd48dfd72947bd48 (diff) | |
more double dispose protection.
Change-Id: I61ecf1561393959bc9a3647d515c4c9ce5119752
Diffstat (limited to 'dbaccess/source/ui/app')
| -rw-r--r-- | dbaccess/source/ui/app/AppView.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 237fc3a11976..2e67c18acd89 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -214,10 +214,17 @@ OApplicationView::~OApplicationView() void OApplicationView::dispose() { - stopComponentListening(m_xObject); - m_pWin->Hide(); - boost::scoped_ptr<vcl::Window> aTemp(m_pWin); - m_pWin = NULL; + if (m_xObject.is()) + { + stopComponentListening(m_xObject); + m_xObject.clear(); + } + if (m_pWin) + { + m_pWin->Hide(); + boost::scoped_ptr<vcl::Window> aTemp(m_pWin); + m_pWin = NULL; + } ODataView::dispose(); } |