Kaydet (Commit) 5613bcfc authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Consistently acquire solar mutex in all CreateSalInstance variants

...where all but the variants for Android and --enable-headless already did so
(and curiously the DestroySalInstance variants for Android and --enable-headless
already contained code to release the solar mutex).  See the thread at
<http://lists.freedesktop.org/archives/libreoffice/2012-December/042535.html>
"--headless broken with --enable-headless" for further details.

Change-Id: I01be2e237e203a151ea8b1f3adfbcb3e63247cd7
üst 0ec25774
...@@ -151,6 +151,7 @@ SalInstance *CreateSalInstance() ...@@ -151,6 +151,7 @@ SalInstance *CreateSalInstance()
fprintf (stderr, "Android: CreateSalInstance!\n"); fprintf (stderr, "Android: CreateSalInstance!\n");
AndroidSalInstance* pInstance = new AndroidSalInstance( new SalYieldMutex() ); AndroidSalInstance* pInstance = new AndroidSalInstance( new SalYieldMutex() );
new AndroidSalData( pInstance ); new AndroidSalData( pInstance );
pInstance->AcquireYieldMutex(1);
return pInstance; return pInstance;
} }
......
...@@ -121,6 +121,7 @@ SalInstance *CreateSalInstance() ...@@ -121,6 +121,7 @@ SalInstance *CreateSalInstance()
{ {
HeadlessSalInstance* pInstance = new HeadlessSalInstance( new SalYieldMutex() ); HeadlessSalInstance* pInstance = new HeadlessSalInstance( new SalYieldMutex() );
new HeadlessSalData( pInstance ); new HeadlessSalData( pInstance );
pInstance->AcquireYieldMutex(1);
return pInstance; return pInstance;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment