diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-12-11 17:26:50 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-12-11 19:49:09 +0100 |
| commit | a3de61e3cea28a251aefddf6ab245bc5249dee24 (patch) | |
| tree | 90ef97c32e9dd8ce4790782b8877f6e9a90e80e7 | |
| parent | a6a0e8059d4996c579d47171a5b833f9b4c22975 (diff) | |
desktop: avoid loading to-be-recovered documents when recovery is disabled
Change-Id: I5c8a117df53e0c7efd1e82ec6e56080c8fd42345
Reviewed-on: https://gerrit.libreoffice.org/13438
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit fbe9accf36ac4c52ef5bcb84d455b4d06c317668)
| -rw-r--r-- | desktop/source/app/app.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index b1003f4d73a2..98490b4460b0 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2313,6 +2313,9 @@ void Desktop::OpenClients() SAL_WARN( "desktop.app", "Error during recovery" << e.Message); } } + else if (bExistsRecoveryData && bDisableRecovery) + // prevent new Writer doc + bRecovery = true; Reference< XSessionManagerListener2 > xSessionListener; try @@ -2326,8 +2329,7 @@ void Desktop::OpenClients() SAL_WARN( "desktop.app", "Registration of session listener failed" << e.Message); } - // in bDisableRecovery case call doRestore() to prevent new Writer doc - if ((!bExistsRecoveryData || bDisableRecovery) && xSessionListener.is()) + if ( !bExistsRecoveryData && xSessionListener.is() ) { // session management try |