[Libreoffice-commits] .: desktop/unx
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Sep 6 03:45:06 PDT 2012
desktop/unx/source/start.c | 11 +++++++++++
1 file changed, 11 insertions(+)
New commits:
commit 5c804dce946a928adcaf97533f5345b33e688ff5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Sep 6 12:43:54 2012 +0200
deb#681185: wait for InternalIPC::ProcessingDone in oosplash
Change-Id: I9606ec34ad0d8d24dca71d060bf5e1d37152903c
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 2ecb779..f1e872e 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -512,6 +512,17 @@ send_args( int fd, rtl_uString *pCwdPath )
nLen = rtl_string_getLength( pOut ) + 1;
bResult = ( write( fd, rtl_string_getStr( pOut ), nLen ) == (ssize_t) nLen );
+ if ( bResult )
+ {
+ char resp[ strlen( "InternalIPC::ProcessingDone" ) ];
+ ssize_t n = read( fd, resp, SAL_N_ELEMENTS( resp ) );
+ bResult = n == (ssize_t) SAL_N_ELEMENTS( resp )
+ && (memcmp(
+ resp, "InternalIPC::ProcessingDone",
+ SAL_N_ELEMENTS( resp ) )
+ == 0);
+ }
+
/* cleanup */
rtl_uString_release( pEscapedCwdPath );
rtl_uString_release( pBuffer );
More information about the Libreoffice-commits
mailing list