parent
73efa355ac
commit
8bd49eaa3c
@ -1 +1,2 @@
|
||||
/kuserfeedback-1.0.0.tar.xz
|
||||
/kuserfeedback-1.2.0.tar.xz
|
||||
|
@ -1,39 +0,0 @@
|
||||
From 17db7d75643b4f3dccd5b36a6ab175f03ba74297 Mon Sep 17 00:00:00 2001
|
||||
From: Aleix Pol <aleixpol@kde.org>
|
||||
Date: Wed, 2 Feb 2022 20:36:40 +0100
|
||||
Subject: [PATCH 77/77] opengl source: Do not crash if we could not make our
|
||||
context current
|
||||
|
||||
BUG: 449505
|
||||
---
|
||||
src/provider/core/openglinfosource.cpp | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/provider/core/openglinfosource.cpp b/src/provider/core/openglinfosource.cpp
|
||||
index 5117d85..08402c7 100644
|
||||
--- a/src/provider/core/openglinfosource.cpp
|
||||
+++ b/src/provider/core/openglinfosource.cpp
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <QOpenGLFunctions>
|
||||
#include <QSurfaceFormat>
|
||||
#include <QWindow>
|
||||
+#include "logging_p.h"
|
||||
#endif
|
||||
|
||||
using namespace KUserFeedback;
|
||||
@@ -37,7 +38,11 @@ QVariant OpenGLInfoSource::data()
|
||||
QWindow window;
|
||||
window.setSurfaceType(QSurface::OpenGLSurface);
|
||||
window.create();
|
||||
- context.makeCurrent(&window);
|
||||
+ if (!context.makeCurrent(&window)) {
|
||||
+ qCWarning(Log) << "Could not make OpenGL context current";
|
||||
+ m.insert(QStringLiteral("type"), QStringLiteral("none"));
|
||||
+ return m;
|
||||
+ }
|
||||
QOpenGLFunctions functions(&context);
|
||||
m.insert(QStringLiteral("vendor"), OpenGLInfoSourcePrivate::normalizeVendor(reinterpret_cast<const char*>(functions.glGetString(GL_VENDOR))));
|
||||
m.insert(QStringLiteral("renderer"), OpenGLInfoSourcePrivate::normalizeRenderer(reinterpret_cast<const char*>(functions.glGetString(GL_RENDERER))));
|
||||
--
|
||||
2.34.1
|
||||
|
@ -1 +1 @@
|
||||
SHA512 (kuserfeedback-1.0.0.tar.xz) = d45c45b3f7b50f7ff3e5e5ae7e6a4cd68c0aa444553d0c44a969ae17e51ef5114ab6401c8ce65744ec3d635cb2edc7a127187547f01f4954faa55087c702dea7
|
||||
SHA512 (kuserfeedback-1.2.0.tar.xz) = 0152233c741a287b623256cac6d109d405441f17dec68c5782d900ddb9ca5a93614d46ea112e1be9e64913cc3f46d107bec64cad4579b766919439b0ed88a470
|
||||
|
Loading…
Reference in new issue