diff options
author | mbr <mbr@FreeBSD.org> | 2003-03-30 21:32:27 +0000 |
---|---|---|
committer | mbr <mbr@FreeBSD.org> | 2003-03-30 21:32:27 +0000 |
commit | 85492562c9f895f396880907473bbe0d89a82cc8 (patch) | |
tree | 98fd8c9c42270d929e6d9ffbc114789f5fb240d5 /editors/openoffice.org-2-RC | |
parent | 164ba59d6b94ac0ef8ae8fd74c8f84fd9e434d89 (diff) | |
download | FreeBSD-ports-85492562c9f895f396880907473bbe0d89a82cc8.zip FreeBSD-ports-85492562c9f895f396880907473bbe0d89a82cc8.tar.gz |
Check for m_pLockfile != NULL to fix crash during startup if no lockfile
does exist at all (if we have no installed user directory)
Diffstat (limited to 'editors/openoffice.org-2-RC')
-rw-r--r-- | editors/openoffice.org-2-RC/patch-desktop+source+app+app.cxx | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/editors/openoffice.org-2-RC/patch-desktop+source+app+app.cxx b/editors/openoffice.org-2-RC/patch-desktop+source+app+app.cxx new file mode 100644 index 0000000..4e82d52 --- /dev/null +++ b/editors/openoffice.org-2-RC/patch-desktop+source+app+app.cxx @@ -0,0 +1,22 @@ +--- ../desktop/source/app/app.cxx.orig Sun Mar 30 22:26:15 2003 ++++ ../desktop/source/app/app.cxx Sun Mar 30 22:27:02 2003 +@@ -587,7 +587,8 @@ + ::comphelper::setProcessServiceFactory( NULL ); + + // clear lockfile +- m_pLockfile->clean(); ++ if (m_pLockfile != NULL) ++ m_pLockfile->clean(); + + if( !Application::IsRemoteServer() ) + { +@@ -621,7 +622,8 @@ + a <<= (sal_Bool)sal_False; + xPropertySet->setPropertyValue( OUSTRING(RTL_CONSTASCII_USTRINGPARAM( SUSPEND_QUICKSTARTVETO )), a ); + } else { +- m_pLockfile->clean(); ++ if (m_pLockfile != NULL) ++ m_pLockfile->clean(); + } + + return bExit; |