Skip to content

C
core
Kaydet (Commit) a14010cb authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

valgrind: fix leak

üst 41214b71
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 4 deletions
desktop/source/app/app.cxx
Dosyayı görüntüle @ a14010cb
...@@ -790,7 +790,10 @@ void Desktop::DeInit() ...@@ -790,7 +790,10 @@ void Desktop::DeInit()
// clear lockfile // clear lockfile
if (m_pLockfile != NULL) if (m_pLockfile != NULL)
m_pLockfile->clean(); {
delete m_pLockfile;
m_pLockfile = NULL;
}
OfficeIPCThread::DisableOfficeIPCThread(); OfficeIPCThread::DisableOfficeIPCThread();
if( pSignalHandler ) if( pSignalHandler )
...@@ -851,7 +854,12 @@ sal_Bool Desktop::QueryExit() ...@@ -851,7 +854,12 @@ sal_Bool Desktop::QueryExit()
{ {
} }
if (m_pLockfile != NULL) m_pLockfile->clean(); if (m_pLockfile != NULL)
{
delete m_pLockfile;
m_pLockfile = NULL;
}
} }
return bExit; return bExit;
...@@ -1466,9 +1474,12 @@ sal_uInt16 Desktop::Exception(sal_uInt16 nError) ...@@ -1466,9 +1474,12 @@ sal_uInt16 Desktop::Exception(sal_uInt16 nError)
default: default:
{ {
if (m_pLockfile != NULL) { if (m_pLockfile != NULL)
m_pLockfile->clean(); {
delete m_pLockfile;
m_pLockfile = NULL;
} }
if( bRestart ) if( bRestart )
{ {
OfficeIPCThread::DisableOfficeIPCThread(); OfficeIPCThread::DisableOfficeIPCThread();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment