[Libreoffice-commits] core.git: vcl/source
Michael Meeks
michael.meeks at collabora.com
Thu Oct 19 13:07:08 UTC 2017
vcl/source/opengl/OpenGLContext.cxx | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 856d734ee1665b6aa7304847c3a923af09066016
Author: Michael Meeks <michael.meeks at collabora.com>
Date: Wed Oct 18 15:24:44 2017 +0100
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 at libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index d5ade0408fc5..b49774171a38 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -404,6 +404,7 @@ void OpenGLContext::reset()
delete pFramebuffer;
pFramebuffer = pPrevFramebuffer;
}
+ mnFramebufferCount = 0;
mpFirstFramebuffer = nullptr;
mpLastFramebuffer = nullptr;
}
More information about the Libreoffice-commits
mailing list