diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-05-19 19:06:45 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-05-19 19:06:45 +0200 |
| commit | 1afc62ef88274fea322f6c53857890fe17c9fdcf (patch) | |
| tree | 443b87b0c515b5ec31c006d5d1af3525c3fdbab0 /src/kernel/qpixmap_x11.cpp | |
| parent | b7d35a6235010df4cdc89961641b57ccb972f7fa (diff) | |
| download | qt3-1afc62ef88274fea322f6c53857890fe17c9fdcf.tar.gz qt3-1afc62ef88274fea322f6c53857890fe17c9fdcf.zip | |
Fix overwriting memory for an application icon
This resolves Bug 2033
Diffstat (limited to 'src/kernel/qpixmap_x11.cpp')
| -rw-r--r-- | src/kernel/qpixmap_x11.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp index d0a16c5..28d2926 100644 --- a/src/kernel/qpixmap_x11.cpp +++ b/src/kernel/qpixmap_x11.cpp @@ -764,6 +764,7 @@ QImage QPixmap::convertToImage() const else #endif qSafeXDestroyImage( xi ); + ((QPixmap*)this)->data->ximage = 0; return image; } @@ -947,7 +948,8 @@ QImage QPixmap::convertToImage() const qt_XShmDestroyImage( xi, &shminfo ); else #endif - qSafeXDestroyImage( xi ); + qSafeXDestroyImage( xi ); + ((QPixmap*)this)->data->ximage = 0; return image; } |