valgrind: fix leak

a14010cb · Caolán McNamara · 41214b71 · a14010cb
Kaydet (Commit) a14010cb authored May 13, 2011 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 4 deletions

app.cxx desktop/source/app/app.cxx +15 -4

No files found.
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -790,7 +790,10 @@ void Desktop::DeInit()

        // clear lockfile
        if (m_pLockfile != NULL)
-            m_pLockfile->clean();
+        {
+            delete m_pLockfile;
+            m_pLockfile = NULL;
+        }

        OfficeIPCThread::DisableOfficeIPCThread();
        if( pSignalHandler )
@@ -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;
@@ -1466,9 +1474,12 @@ sal_uInt16 Desktop::Exception(sal_uInt16 nError)

        default:
        {
-            if (m_pLockfile != NULL) {
-                m_pLockfile->clean();
+            if (m_pLockfile != NULL)
+            {
+                delete m_pLockfile;
+                m_pLockfile = NULL;
            }
+
            if( bRestart )
            {
                OfficeIPCThread::DisableOfficeIPCThread();