[Libreoffice-commits] core.git: vcl/source

[Tor Lillqvist]

 vcl/source/opengl/OpenGLHelper.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit bf5a6730a50cc089d32be5168ca4925910974e0c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Apr 15 09:53:30 2014 +0300

    Avoid complex static global initialisation
    
    Caused an assertion failure: "sal/osl/unx/process_impl.cxx:167: sal_uInt32
    osl_getCommandArgCount(): Assertion `g_command_args.m_nCount != 0' failed".
    
    Change-Id: Ib01e0312e328f751c9353aab95dceb977b818b0c

diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 75eefe7..0042231 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -25,11 +25,9 @@ OUString getShaderFolder()
     return aUrl + "/opengl/";
 }
 
-OUString maShaderFolder = getShaderFolder();
-
 OString loadShader(const OUString& rFilename)
 {
-    OUString aFileURL = maShaderFolder + rFilename +".glsl";
+    OUString aFileURL = getShaderFolder() + rFilename +".glsl";
     osl::File aFile(aFileURL);
     if(aFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None)
     {