summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorm0dB <79429057+m0dB@users.noreply.github.com>2023-05-27 12:57:12 +0200
committerm0dB <79429057+m0dB@users.noreply.github.com>2023-05-27 12:57:12 +0200
commit5a69bc3d531488598826e39a2e830447400c4afd (patch)
treefcec3c71ec60b70a70d9f2936f8b9fdd483cce92
parent63a626d02883b8845ddf1923edcce18bb804232d (diff)
added missing calls to doneCurrent for correctness
-rw-r--r--src/waveform/waveformwidgetfactory.cpp1
-rw-r--r--src/waveform/widgets/glslwaveformwidget.cpp4
-rw-r--r--src/waveform/widgets/qthsvwaveformwidget.cpp1
3 files changed, 5 insertions, 1 deletions
diff --git a/src/waveform/waveformwidgetfactory.cpp b/src/waveform/waveformwidgetfactory.cpp
index d1ebe337b0..b92ffd16d0 100644
--- a/src/waveform/waveformwidgetfactory.cpp
+++ b/src/waveform/waveformwidgetfactory.cpp
@@ -168,6 +168,7 @@ WaveformWidgetFactory::WaveformWidgetFactory()
m_openGLVersion += " (" + rendererString + ")";
}
}
+ widget->doneCurrent();
widget->hide();
}
#else
diff --git a/src/waveform/widgets/glslwaveformwidget.cpp b/src/waveform/widgets/glslwaveformwidget.cpp
index 0ea708d47e..4852974519 100644
--- a/src/waveform/widgets/glslwaveformwidget.cpp
+++ b/src/waveform/widgets/glslwaveformwidget.cpp
@@ -62,6 +62,8 @@ GLSLWaveformWidget::GLSLWaveformWidget(
addRenderer<WaveformRenderBeat>();
addRenderer<WaveformRenderMark>();
+ doneCurrent();
+
m_initSuccess = init();
}
@@ -93,6 +95,7 @@ void GLSLWaveformWidget::resize(int width, int height) {
// and the Gl Context should be properly set
makeCurrentIfNeeded();
WaveformWidgetAbstract::resize(width, height);
+ doneCurrent();
}
void GLSLWaveformWidget::mouseDoubleClickEvent(QMouseEvent *event) {
@@ -103,5 +106,6 @@ void GLSLWaveformWidget::mouseDoubleClickEvent(QMouseEvent *event) {
m_signalRenderer->debugClick();
}
#endif // !defined(QT_NO_OPENGL) && !defined(QT_OPENGL_ES_2)
+ doneCurrent();
}
}
diff --git a/src/waveform/widgets/qthsvwaveformwidget.cpp b/src/waveform/widgets/qthsvwaveformwidget.cpp
index 2ef6e20b3b..53ad3b95bc 100644
--- a/src/waveform/widgets/qthsvwaveformwidget.cpp
+++ b/src/waveform/widgets/qthsvwaveformwidget.cpp
@@ -16,7 +16,6 @@
QtHSVWaveformWidget::QtHSVWaveformWidget(const QString& group, QWidget* parent)
: GLWaveformWidgetAbstract(group, parent) {
- makeCurrentIfNeeded();
addRenderer<GLWaveformRenderBackground>();
addRenderer<WaveformRendererEndOfTrack>();
addRenderer<WaveformRendererPreroll>();