AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QOpenGLDebugLogger: do not crash if deleted with the wrong GL context current

Browse Source 
Task-number: QTBUG-54799
Change-Id: Ifee3183e7944fbe266fe644628d33d0667be99a8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Giuseppe D'Angelo 2016-07-19 13:48:33 +01:00
parent d9831a03ca
commit 107ac187bc
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/opengl/qopengldebug.cpp
View File

@ -1500,6 +1500,12 @@ void QOpenGLDebugLogger::stopLogging()
if (!d->isLogging)
return;
QOpenGLContext *currentContext = QOpenGLContext::currentContext();
if (!currentContext || currentContext != d->context) {
qWarning("QOpenGLDebugLogger::stopLogging(): attempting to stop logging with the wrong OpenGL context current");
return;
}
d->isLogging = false;
d->glDebugMessageCallback(d->oldDebugCallbackFunction, d->oldDebugCallbackParameter);