diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2011-04-28 14:02:10 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2011-04-28 14:04:47 +0200 |
commit | 282d1e08446b9a0a33a3ceaad67f89624c00a3ba (patch) | |
tree | 2d430185da6b2155b71257026eef46b8bd93955c /desktop/source | |
parent | b3a2cbcd4cfebefb17302614712234dc67ff8f0d (diff) |
add presumably missing ReleaseSolarMutex() call
Noticed by Julien Nabet <serval2412@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() ).
Diffstat (limited to 'desktop/source')
-rw-r--r-- | desktop/source/app/app.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index b37820578355..5ca7e7042ba2 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!! |