mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #63 from YACReader/feature/fix_ogl_texture_destruction

Browse Source 
Fix YACReaderPageFlowGL texture destruction
This commit is contained in:
Luis Ángel San Martín 2019-06-01 16:14:17 +02:00 committed by GitHub
commit ad33a73f2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/gl/yacreader_flow_gl.cpp
View File

@ -1266,22 +1266,23 @@ YACReaderPageFlowGL::YACReaderPageFlowGL(QWidget *parent, struct Preset p)
YACReaderPageFlowGL::~YACReaderPageFlowGL() YACReaderPageFlowGL::~YACReaderPageFlowGL()
{ {
this->killTimer(timerId); this->killTimer(timerId);
//worker->deleteLater();
rawImages.clear(); rawImages.clear();
//TODO: remove checking for a valid context makeCurrent();
//checking is needed because of this bug this bug: https://bugreports.qt.io/browse/QTBUG-60148
if (this->context() != nullptr && this->context()->isValid()) {
for (int i = 0; i < numObjects; i++) {
if (images[i].texture != defaultTexture) {
delete (images[i].texture);
}
}
if (defaultTexture != nullptr) { for(auto image : images) {
delete defaultTexture; if (image.texture != defaultTexture) {
image.texture->destroy();
delete image.texture;
} }
} }
if (defaultTexture != nullptr) {
defaultTexture->destroy();
delete defaultTexture;
}
doneCurrent();
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////