From 1338b165692d380c2e0b89d565a092f6efc9e3c9 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 22 Sep 2017 09:51:04 +0000 Subject: [PATCH] #1569 if all the opengl backends we try have failed, just log warning and continue git-svn-id: https://xpra.org/svn/Xpra/trunk@16952 3bb7dfac-3a0b-4e04-842a-767bc560f471 --- src/xpra/client/gtk_base/gtk_client_base.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/xpra/client/gtk_base/gtk_client_base.py b/src/xpra/client/gtk_base/gtk_client_base.py index 4c777e58ab..70329d28c2 100644 --- a/src/xpra/client/gtk_base/gtk_client_base.py +++ b/src/xpra/client/gtk_base/gtk_client_base.py @@ -743,6 +743,7 @@ def err(msg, e): else: backends = enable_opengl.split(",") opengllog("init_opengl: backend options: %s", backends) + gl_client_window_module = None for impl in backends: opengllog("attempting to load %s OpenGL backend", impl) GL_CLIENT_WINDOW_MODULE = "xpra.client.gl.gtk%s.%sgl_client_window" % (gtk_version(), impl) @@ -751,7 +752,7 @@ def err(msg, e): gl_client_window_module = __import__(GL_CLIENT_WINDOW_MODULE, {}, {}, ["GLClientWindow", "check_support"]) except ImportError as e: opengllog("cannot import %s", GL_CLIENT_WINDOW_MODULE, exc_info=True) - opengllog.warn("Warning: cannot import %s module", impl) + opengllog.warn("Warning: cannot import %s OpenGL module", impl) opengllog.warn(" %s", e) continue opengllog("%s=%s", GL_CLIENT_WINDOW_MODULE, gl_client_window_module) @@ -760,6 +761,11 @@ def err(msg, e): opengllog("check_support(%s)=%s", force_enable, self.opengl_props) if self.opengl_props: break + if not gl_client_window_module: + opengllog.warn("Warning: no OpenGL backends found") + self.client_supports_opengl = False + self.opengl_props["info"] = "disabled: no supported backends - tried: %s" % backends + return opengllog("init_opengl: found props %s", self.opengl_props) self.GLClientWindowClass = gl_client_window_module.GLClientWindow self.client_supports_opengl = True