From 787b2bf8cc7ee3cff18c4888866a381fe4656913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sat, 23 Jul 2011 21:32:12 +0200 Subject: [PATCH] Fix regression introduced with 909b4efa I still don't understand how I actually tested my patch before committing. It was working, sigh. That were several hours of annoyance including a git bisect presenting my own commit I assumed to be correct. Sigh. --- libkwineffects/kwinglutils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libkwineffects/kwinglutils.cpp b/libkwineffects/kwinglutils.cpp index 2f016305b2..b53ac0e3c9 100644 --- a/libkwineffects/kwinglutils.cpp +++ b/libkwineffects/kwinglutils.cpp @@ -601,6 +601,8 @@ ShaderManager *ShaderManager::instance() { if (!s_shaderManager) { s_shaderManager = new ShaderManager(); + s_shaderManager->initShaders(); + s_shaderManager->m_inited = true; } return s_shaderManager; } @@ -619,8 +621,6 @@ ShaderManager::ShaderManager() , m_valid(false) { m_debug = qstrcmp(qgetenv("KWIN_GL_DEBUG"), "1") == 0; - initShaders(); - m_inited = true; } ShaderManager::~ShaderManager()