summaryrefslogtreecommitdiffstats
path: root/src/platformsupport/glxconvenience/qglxconvenience.cpp
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2020-03-19 16:10:31 +0100
committerMitch Curtis <mitch.curtis@qt.io>2020-03-19 16:10:31 +0100
commit1480922511853b20a5484d941f2d3c629768b7fe (patch)
tree4daff52de8bff80dfe5dea3ebc3fa82b97cf0047 /src/platformsupport/glxconvenience/qglxconvenience.cpp
parent05dd80871c870a564a46e388d7fd124a58fc970d (diff)
parent1a18e138f4d17c219c6ffd6e4396c30b960818b4 (diff)
Merge remote-tracking branch 'origin/5.14.2' into 5.14
Diffstat (limited to 'src/platformsupport/glxconvenience/qglxconvenience.cpp')
-rw-r--r--src/platformsupport/glxconvenience/qglxconvenience.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/platformsupport/glxconvenience/qglxconvenience.cpp b/src/platformsupport/glxconvenience/qglxconvenience.cpp
index 81bccb1c25..e2f4922c8a 100644
--- a/src/platformsupport/glxconvenience/qglxconvenience.cpp
+++ b/src/platformsupport/glxconvenience/qglxconvenience.cpp
@@ -224,6 +224,8 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , QSurfaceFormat format
}
QXlibPointer<XVisualInfo> visual(glXGetVisualFromFBConfig(display, candidate));
+ if (!visual)
+ continue;
int actualRed;
int actualGreen;
int actualBlue;