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

[Tomaž Vajngerl]

 vcl/inc/opengl/AccumulatedTextures.hxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0214aa8ce427905477602dbf1d55278c4959fcac
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date:   Tue May 10 20:01:29 2016 +0900

    opengl: Check if texture is valid before asking for Id
    
    Change-Id: I6482ca005df385d79bcd55f3b1db3559021ab371
    Reviewed-on: https://gerrit.libreoffice.org/24835
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>
    Tested-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/vcl/inc/opengl/AccumulatedTextures.hxx b/vcl/inc/opengl/AccumulatedTextures.hxx
index bc40c48..882a694 100644
--- a/vcl/inc/opengl/AccumulatedTextures.hxx
+++ b/vcl/inc/opengl/AccumulatedTextures.hxx
@@ -90,11 +90,11 @@ public:
 
     bool insert(OpenGLTexture& rTexture, const SalColor& aColor, const SalTwoRect& r2Rect)
     {
-        GLuint nTextureId = rTexture.Id();
-
         if (!rTexture)
             return false;
 
+        GLuint nTextureId = rTexture.Id();
+
         if (maEntries.find(nTextureId) == maEntries.end())
         {
             OpenGLTexture aWholeTexture(rTexture.GetWholeTexture());