Initialize pointer and use less restrictive condition in destructor

This commit is contained in:
Luis Ángel San Martín 2019-06-02 09:37:40 +02:00
parent 5db5fb7e0c
commit 98a6ef5698

View File

@ -191,7 +191,7 @@ struct Preset pressetYACReaderFlowDownConfig = {
}; };
/*Constructor*/ /*Constructor*/
YACReaderFlowGL::YACReaderFlowGL(QWidget *parent, struct Preset p) YACReaderFlowGL::YACReaderFlowGL(QWidget *parent, struct Preset p)
: QOpenGLWidget(/*QOpenGLWidget migration QGLFormat(QGL::SampleBuffers),*/ parent), numObjects(0), lazyPopulateObjects(-1), hasBeenInitialized(false), bUseVSync(false), flowRightToLeft(false) : QOpenGLWidget(/*QOpenGLWidget migration QGLFormat(QGL::SampleBuffers),*/ parent), numObjects(0), lazyPopulateObjects(-1), defaultTexture(nullptr), hasBeenInitialized(false), bUseVSync(false), flowRightToLeft(false)
{ {
updateCount = 0; updateCount = 0;
config = p; config = p;
@ -1270,7 +1270,6 @@ YACReaderPageFlowGL::~YACReaderPageFlowGL()
makeCurrent(); makeCurrent();
if (this->context() != nullptr && this->context()->isValid()) {
for (auto image : images) { for (auto image : images) {
if (image.texture != defaultTexture) { if (image.texture != defaultTexture) {
if (image.texture->isCreated()) { if (image.texture->isCreated()) {
@ -1286,7 +1285,6 @@ YACReaderPageFlowGL::~YACReaderPageFlowGL()
} }
delete defaultTexture; delete defaultTexture;
} }
}
doneCurrent(); doneCurrent();
} }