[Libreoffice-commits] .: desktop/source

[Lubos Lunak]

 desktop/source/app/app.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 7bc14cf6a322c0a68ca1841917fb119b553be3a8
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Apr 28 14:02:10 2011 +0200

    add presumably missing ReleaseSolarMutex() call
    
    Noticed by Julien Nabet <serval2412 at yahoo.fr>. It seems commit
    b58863e8ddc923fa737d064b873b8099a24a8c51 reorganized the code
    and removed this call. Not quite sure if it's needed as it has
    apparently worked fine for a while, but this should match the code
    before that commit (except for the pointless TryToAcquire() ).

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 78961b3..e05d4f2 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1596,7 +1596,6 @@ int Desktop::Main()
         ::comphelper::getProcessServiceFactory();
 
     Reference< ::com::sun::star::task::XRestartManager > xRestartManager;
-    int         nAcquireCount( 0 );
     try
     {
         RegisterServices( xSMgr );
@@ -1865,6 +1864,9 @@ int Desktop::Main()
             return EXIT_FAILURE;
         }
 
+        // Release solar mutex just before we wait for our client to connect
+        int nAcquireCount = Application::ReleaseSolarMutex();
+
         // Post user event to startup first application component window
         // We have to send this OpenClients message short before execute() to
         // minimize the risk that this message overtakes type detection contruction!!