diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-15 09:53:30 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-15 09:53:35 +0300 |
| commit | bf5a6730a50cc089d32be5168ca4925910974e0c (patch) | |
| tree | d45d2d51b3f04c7a0e5f1e3fc9b5ca9b14db9f04 | |
| parent | 26d88611665423a5662394af684c7e3f20b0dd6d (diff) | |
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
| -rw-r--r-- | vcl/source/opengl/OpenGLHelper.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index 75eefe7c1f3f..0042231779d8 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) { |