summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2017-10-18 15:24:44 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-10-19 21:36:35 +0200
commit5396ddfb01539424c3aef02bbdea3c5c3152a4ce (patch)
treea5a788f547f0471926484ed7278ac55de05a070f
parent18d0268acce2fdd10a1186e1466768887f64623e (diff)
tdf#113225 - reset framebuffer count when resetting OpenGLContext
Otherwise we can fail to allocate a new one when we need it post reset. http://crashreport.libreoffice.org/stats/crash_details/e4f26191-15d5-441a-868f-9ada21ef4424 Change-Id: Icc5ec6c51338e18a0a1bc890f56670e8fe9c73ea Reviewed-on: https://gerrit.libreoffice.org/43508 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> (cherry picked from commit 856d734ee1665b6aa7304847c3a923af09066016) Reviewed-on: https://gerrit.libreoffice.org/43551 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/source/opengl/OpenGLContext.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index fc12d88617ff..57216f9827a2 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -422,6 +422,7 @@ void OpenGLContext::reset()
delete pFramebuffer;
pFramebuffer = pPrevFramebuffer;
}
+ mnFramebufferCount = 0;
mpFirstFramebuffer = nullptr;
mpLastFramebuffer = nullptr;
}