summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@pelagicore.com>2018-03-29 17:18:30 +0200
committerDominik Holland <dominik.holland@pelagicore.com>2018-04-03 07:58:22 +0000
commitbb786fa9feb03d0633ba7697d3dac5235dda0636 (patch)
tree16adfd777c2750f2471302524bc0d2b0fbcf4e78
parent3673317ff514b4b50ab619ac0636accfcb7a57c4 (diff)
Explicitly call doneCurrent to work around crash on NUC with eglfs
Change-Id: Id5d38edbed398441c85de2b53df010f171dc997a Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
-rw-r--r--src/manager-lib/systemreader.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/manager-lib/systemreader.cpp b/src/manager-lib/systemreader.cpp
index 708a5362..76d63406 100644
--- a/src/manager-lib/systemreader.cpp
+++ b/src/manager-lib/systemreader.cpp
@@ -166,12 +166,14 @@ public:
readVendor(QOpenGLContext::currentContext());
} else {
QOpenGLContext c;
- c.create();
- QOffscreenSurface s;
- s.create();
- c.makeCurrent(&s);
-
- readVendor(&c);
+ if (c.create()) {
+ QOffscreenSurface s;
+ s.setFormat(c.format());
+ s.create();
+ c.makeCurrent(&s);
+ readVendor(&c);
+ c.doneCurrent();
+ }
}
# endif
if (vendor.contains("intel")) {