[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - filter/source

[Caolán McNamara]

 filter/source/graphicfilter/ieps/ieps.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f793a5a2847e5fe03ccacf7127c153a76863d468
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Apr 28 20:45:19 2014 +0100

    Related: fdo#64161 pstoedit not writing file until its closed
    
    there's more to this than that, but at least its consistent this way and not
    differing per person. Its a bit unfortunate that pstoedit can't render the text
    in this example either though.
    
    Change-Id: I6f6bb7f83ed23dfc0f6b5c5f2b00753fa7190a8d
    (cherry picked from commit 4d88c6dee6d57fa9c366b67624842aefa429f527)
    Reviewed-on: https://gerrit.libreoffice.org/9196
    Tested-by: David Tardon <dtardon at redhat.com>
    Reviewed-by: David Tardon <dtardon at redhat.com>

diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx
index 7da240f..94bf6ac 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -234,14 +234,14 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r
         osl_closeFile(pOut);
     }
     if (pErr) osl_closeFile(pErr);
+    osl_joinProcess(aProcess);
+    osl_freeProcessHandle(aProcess);
     if (nCount == nBytesRead && bEMFSupported)
     {
         SvFileStream aFile(output, STREAM_READ);
         if (GraphicConverter::Import(aFile, rGraphic, CVT_EMF) == ERRCODE_NONE)
             bRet = true;
     }
-    osl_joinProcess(aProcess);
-    osl_freeProcessHandle(aProcess);
     return bRet;
 }