makeCurrent when destroying ManagedDisplayWidgets

Fixes #1555
This commit is contained in:
itsmattkc
2021-04-08 18:59:04 +10:00
parent ba0eb2335b
commit abe28f81bf
10 changed files with 24 additions and 33 deletions
+6 -9
View File
@@ -24,18 +24,15 @@
namespace olive {
#define super ManagedDisplayWidget
ScopeBase::ScopeBase(QWidget* parent) :
ManagedDisplayWidget(parent),
super(parent),
buffer_(nullptr)
{
EnableDefaultContextMenu();
}
ScopeBase::~ScopeBase()
{
OnDestroy();
}
void ScopeBase::SetBuffer(Frame *frame)
{
buffer_ = frame;
@@ -45,7 +42,7 @@ void ScopeBase::SetBuffer(Frame *frame)
void ScopeBase::showEvent(QShowEvent* e)
{
ManagedDisplayWidget::showEvent(e);
super::showEvent(e);
UploadTextureFromBuffer();
}
@@ -92,7 +89,7 @@ void ScopeBase::UploadTextureFromBuffer()
void ScopeBase::OnInit()
{
ManagedDisplayWidget::OnInit();
super::OnInit();
UploadTextureFromBuffer();
@@ -114,7 +111,7 @@ void ScopeBase::OnPaint()
void ScopeBase::OnDestroy()
{
ManagedDisplayWidget::OnDestroy();
super::OnDestroy();
managed_tex_ = nullptr;
texture_ = nullptr;