summaryrefslogtreecommitdiffstats
path: root/src/waveform
diff options
context:
space:
mode:
authorUwe Klotz <uklotz@mixxx.org>2020-07-12 11:17:58 +0200
committerUwe Klotz <uklotz@mixxx.org>2020-07-12 11:22:54 +0200
commit4bdc96f230be8e72438bba01c509e0dab7934266 (patch)
treea5b06cfd4c1f207b5d95c6ad8bd4dc605691ce4a /src/waveform
parent48f0d04aa7502fc0d705f052fe4350bb7492f657 (diff)
Fix crash in ~GLSLWaveformWidget()
Diffstat (limited to 'src/waveform')
-rw-r--r--src/waveform/widgets/glslwaveformwidget.cpp4
-rw-r--r--src/waveform/widgets/glslwaveformwidget.h8
2 files changed, 2 insertions, 10 deletions
diff --git a/src/waveform/widgets/glslwaveformwidget.cpp b/src/waveform/widgets/glslwaveformwidget.cpp
index 1950193eba..bd41db9ed6 100644
--- a/src/waveform/widgets/glslwaveformwidget.cpp
+++ b/src/waveform/widgets/glslwaveformwidget.cpp
@@ -64,10 +64,6 @@ GLSLWaveformWidget::GLSLWaveformWidget(
m_initSuccess = init();
}
-GLSLWaveformWidget::~GLSLWaveformWidget() {
- makeCurrent();
-}
-
void GLSLWaveformWidget::castToQWidget() {
m_widget = static_cast<QWidget*>(static_cast<QGLWidget*>(this));
}
diff --git a/src/waveform/widgets/glslwaveformwidget.h b/src/waveform/widgets/glslwaveformwidget.h
index da946fedfe..85baf50dcd 100644
--- a/src/waveform/widgets/glslwaveformwidget.h
+++ b/src/waveform/widgets/glslwaveformwidget.h
@@ -1,5 +1,4 @@
-#ifndef GLWAVEFORMWIDGETSHADER_H
-#define GLWAVEFORMWIDGETSHADER_H
+#pragma once
#include <QGLWidget>
@@ -14,7 +13,7 @@ class GLSLWaveformWidget : public QGLWidget, public WaveformWidgetAbstract {
const QString& group,
QWidget* parent,
bool rgbRenderer);
- ~GLSLWaveformWidget() override;
+ ~GLSLWaveformWidget() override = default;
void resize(int width, int height) override;
@@ -59,6 +58,3 @@ class GLSLRGBWaveformWidget : public GLSLWaveformWidget {
static inline bool useOpenGLShaders() { return true; }
static inline bool developerOnly() { return false; }
};
-
-
-#endif // GLWAVEFORMWIDGETSHADER_H