mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid soffice.bin restarting ad inf when version ini-file buildid is empty

Browse Source 
...for whatever reason (one being that in a build from tarball, the "git log"
call in instsetoo_native/CustomTarget_setup.mk will produce no value).

Change-Id: I3116a7dded4bc502ef8970a3d433b572c989dd65
This commit is contained in:
Stephan Bergmann
2014-04-16 14:46:37 +02:00
parent a1b1b79adb
commit 0fc6ac8a07
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
desktop/source/app/app.cxx
View File

@@ -261,7 +261,8 @@ bool cleanExtensionCache() {
SAL_WARN_IF(
rc2 != osl::FileBase::E_None, "desktop.app",
"cannot close " << fr.getURL() << " after reading: " << +rc2);
if (rc != osl::FileBase::E_None) {
// readLine returns E_AGAIN for a zero-size file:
if (rc != osl::FileBase::E_None && rc != osl::FileBase::E_AGAIN) {
SAL_WARN( "desktop.app", "cannot read from " << fr.getURL() << ": " << +rc);
break;
}