From e80fb93ad0557293233a47cdcdb04f3579172297 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 2 Feb 2019 12:47:12 +1100 Subject: [PATCH] fixed #395 --- playback/playback.cpp | 6 ++---- project/media.cpp | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/playback/playback.cpp b/playback/playback.cpp index 744723c4e..f6757612b 100644 --- a/playback/playback.cpp +++ b/playback/playback.cpp @@ -69,10 +69,8 @@ void close_clip(Clip* clip, bool wait) { clip->finished_opening = false; // destroy opengl texture in main thread - if (clip->texture != nullptr) { - delete clip->texture; - clip->texture = nullptr; - } + delete clip->texture; + clip->texture = nullptr; for (int i=0;ieffects.size();i++) { if (clip->effects.at(i)->is_open()) clip->effects.at(i)->close(); diff --git a/project/media.cpp b/project/media.cpp index 083da219d..92141ef7e 100644 --- a/project/media.cpp +++ b/project/media.cpp @@ -52,8 +52,7 @@ Media::~Media() { case MEDIA_TYPE_FOOTAGE: delete to_footage(); break; case MEDIA_TYPE_SEQUENCE: if (object != nullptr) delete to_sequence(); break; } - if (throbber != nullptr) delete throbber; -// qDeleteAll(children); + delete throbber; } Footage *Media::to_footage() {