diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-16 14:46:37 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-16 14:49:19 +0200 |
| commit | 0fc6ac8a07cbc78133b4d85f78677a9a8fdcc71a (patch) | |
| tree | 6c559f4258ecf7b3b73c435cc9ad91845dbd5b9d /desktop | |
| parent | a1b1b79adb9f93a1bb503862675bc42814900ac9 (diff) | |
Avoid soffice.bin restarting ad inf when version ini-file buildid is empty
...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
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 518c6949a7d5..037858cb8ca1 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -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; } |