Merge branch 'Plasma/5.3'

This commit is contained in:
Martin Gräßlin 2015-05-20 15:17:17 +02:00
commit efdd9c762b

View file

@ -203,9 +203,9 @@ bool TrackMouseEffect::init()
{ {
effects->makeOpenGLContextCurrent(); effects->makeOpenGLContextCurrent();
#ifdef KWIN_HAVE_XRENDER_COMPOSITING #ifdef KWIN_HAVE_XRENDER_COMPOSITING
if (!(m_texture[0] || m_picture[0] || m_image[0].isNull())) { if (!(m_texture[0] || m_picture[0] || !m_image[0].isNull())) {
loadTexture(); loadTexture();
if (!(m_texture[0] || m_picture[0] || m_image[0].isNull())) if (!(m_texture[0] || m_picture[0] || !m_image[0].isNull()))
return false; return false;
} }
#else #else