Merge branch 'Plasma/5.7'

remotes/origin/graesslin/sharing-platform-context-no-surfaceless
Martin Gräßlin 10 years ago
commit 5ecec4e42c
  1. 3
      scene_opengl.cpp

@ -1646,7 +1646,8 @@ void SceneOpenGL2Window::performPaint(int mask, QRegion region, WindowPaintData
setBlendEnabled(false);
// render sub-surfaces
const auto &children = windowPixmap<OpenGLWindowPixmap>()->children();
auto wp = windowPixmap<OpenGLWindowPixmap>();
const auto &children = wp ? wp->children() : QVector<WindowPixmap*>();
windowMatrix.translate(toplevel->clientPos().x(), toplevel->clientPos().y());
for (auto pixmap : children) {
if (pixmap->subSurface().isNull() || pixmap->subSurface()->surface().isNull() || !pixmap->subSurface()->surface()->isMapped()) {

Loading…
Cancel
Save