[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwin] /: Do not init XRenderUtils on Wayland
From:       Martin_Gräßlin <mgraesslin () kde ! org>
Date:       2015-03-18 15:39:30
Message-ID: E1YYG4A-0001Iu-Bh () scm ! kde ! org
[Download RAW message or body]

Git commit 8b8167b565ebdd817ee3f865356f00bf7266a621 by Martin Gräßlin.
Committed on 18/03/2015 at 15:24.
Pushed by graesslin into branch 'master'.

Do not init XRenderUtils on Wayland

If something calls into XRender it would be a bug.

M  +3    -1    workspace.cpp

http://commits.kde.org/kwin/8b8167b565ebdd817ee3f865356f00bf7266a621

diff --git a/workspace.cpp b/workspace.cpp
index fc0699b..a1bcb89 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -191,7 +191,9 @@ Workspace::Workspace(bool restore)
 #endif
 
     // init XRenderUtils
-    XRenderUtils::init(connection(), rootWindow());
+    if (kwinApp()->operationMode() == Application::OperationModeX11) {
+        XRenderUtils::init(connection(), rootWindow());
+    }
     if (Compositor::self()) {
         m_compositor = Compositor::self();
     } else {

[prev in list] [next in list] [prev in thread] [next in thread]