mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid complex static global initialisation

Browse Source 
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
This commit is contained in:
Tor Lillqvist
2014-04-15 09:53:30 +03:00
parent 26d8861166
commit bf5a6730a5
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vcl/source/opengl/OpenGLHelper.cxx
View File

@@ -25,11 +25,9 @@ OUString getShaderFolder()
return aUrl + "/opengl/"; return aUrl + "/opengl/";
} }
OUString maShaderFolder = getShaderFolder();
OString loadShader(const OUString& rFilename) OString loadShader(const OUString& rFilename)
{ {
OUString aFileURL = maShaderFolder + rFilename +".glsl"; OUString aFileURL = getShaderFolder() + rFilename +".glsl";
osl::File aFile(aFileURL); osl::File aFile(aFileURL);
if(aFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None) if(aFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None)
{ {