desktop/source/app/app.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 4322b69dfcce61ff962be42189dff8ad610ef20e Author: Miklos Vajna <[email protected]> Date: Wed Feb 14 10:42:02 2018 +0100 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 <[email protected]> Reviewed-by: Miklos Vajna <[email protected]> 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); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
