diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-02-14 10:42:02 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-02-14 20:48:23 +0100 |
| commit | 4322b69dfcce61ff962be42189dff8ad610ef20e (patch) | |
| tree | 67a91543826d46a3a5584234c6c19217e3d39fbf /desktop | |
| parent | 8b73bafbc18acb4dd8911d2f2de8158d98eb6144 (diff) | |
desktop: allow disabling recovery via config key
The documentation suggests this should disable recovery, so read the
config value at the same place where we disable recovery due to the
environment variable.
Change-Id: I342ae58201aa1d731a5913c2f0598ddff2a8d602
Reviewed-on: https://gerrit.libreoffice.org/49706
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index d3eadd1d4987..d00adb195ac0 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2044,7 +2044,9 @@ void Desktop::OpenClients() bool bCrashed = false; bool bExistsRecoveryData = false; bool bExistsSessionData = false; - bool const bDisableRecovery = getenv("OOO_DISABLE_RECOVERY") != nullptr; + bool const bDisableRecovery + = getenv("OOO_DISABLE_RECOVERY") != nullptr + || !officecfg::Office::Recovery::RecoveryInfo::Enabled::get(); impl_checkRecoveryState(bCrashed, bExistsRecoveryData, bExistsSessionData); |