[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - desktop/source

[Jan Holesovsky]

 desktop/source/app/app.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7788175562494b0a907c87c1238bb3703bed2598
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Nov 10 12:42:47 2015 +0100

    desktop: Make the --writer/--calc/--impress command line options work again.
    
    Change-Id: I977d1fbedb1b784cb95273184ec5e5a7fa156eef

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 5042752..f204d20b 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2272,7 +2272,7 @@ void Desktop::OpenClients()
                 SAL_WARN( "desktop.app", "Error during recovery" << e.Message);
             }
         }
-        else if (bExistsRecoveryData && bDisableRecovery)
+        else if (bExistsRecoveryData && bDisableRecovery && !rArgs.HasModuleParam())
             // prevent new Writer doc
             bRecovery = true;