diff options
| author | Gunnar Sletta <gunnar@crimson.no> | 2017-01-09 15:21:47 +0100 |
|---|---|---|
| committer | Gunnar Sletta <gunnar@crimson.no> | 2017-01-10 08:19:28 +0000 |
| commit | 208e118924d648a472dafd18d11f3404e30ad8be (patch) | |
| tree | 97f96e9aeb295cab2c40e63804bd621f482a08e6 /src/quick/items/context2d | |
| parent | a0ed2b0ef3f9259f245294c59e6f4695f29caddd (diff) | |
Fix crash in Canvas
The Image based code path will delete the texture in textureForNextFrame()
so deleting it again here is wrong. The convention is supposed to be that
if the textureForNextFrame returns 0, it also deleted the input texture.
So not deleting is correct for both Image and FBO.
Change-Id: I45a5ef94c13358f3637f51ae2d21224518ea6a25
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/quick/items/context2d')
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 212148b754..28e9173bf7 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -766,7 +766,6 @@ QSGNode *QQuickCanvasItem::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData if (!texture) { delete node; d->node = 0; - delete d->nodeTexture; d->nodeTexture = 0; if (d->textureProvider) { d->textureProvider->tex = 0; |