[Libreoffice-commits] .: Branch 'libreoffice-3-6' - desktop/unx

[Libreoffice Gerrit user]

 desktop/unx/source/start.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit da329b8bb04f5d6a5c89afb7f083c7de679d5691
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
    (cherry picked from commit 5c804dce946a928adcaf97533f5345b33e688ff5)
    Reviewed-on: https://gerrit.libreoffice.org/569
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Tested-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index d1a09a7..8fe4774 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 );