[Libreoffice-commits] core.git: Branch 'private/hcvcastro/preinit' - desktop/source

[Henry Castro]

 desktop/source/lib/init.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5476f0f4eed5123e2c70887ed8f03f6a55bc7e5e
Author: Henry Castro <hcastro at collabora.com>
Date:   Tue Sep 8 15:25:14 2015 -0400

    desktop: make sure Application is created ...
    
    before trying to acquire SolarMutex
    
    Change-Id: I0628c9638daff649bb8f4b532460efebba844ec0

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 9c2fcfc..98a0548 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -941,7 +941,8 @@ static bool initialize_uno(const OUString& aAppProgramURL)
 
 static void lo_startmain(void*)
 {
-    Application::GetSolarMutex().tryToAcquire();
+    if (GetpApp())
+        Application::GetSolarMutex().tryToAcquire();
 
     soffice_main();
 }