don't leak fpstext texture

BUG: 325610
FIXED-IN: 4.11.3
REVIEW: 113136
remotes/origin/Plasma/5.0
Thomas Lübking 13 years ago
parent eb059ad8a6
commit 57cc5e2954
  1. 4
      effects/showfps/showfps.cpp
  2. 2
      effects/showfps/showfps.h

@ -47,7 +47,6 @@ const int MAX_TIME = 100;
ShowFpsEffect::ShowFpsEffect()
: paints_pos(0)
, frames_pos(0)
, fpsText(0)
, m_noBenchmark(effects->effectFrame(EffectFrameUnstyled, false))
{
for (int i = 0;
@ -233,8 +232,7 @@ void ShowFpsEffect::paintGL(int fps)
// Paint FPS numerical value
if (fpsTextRect.isValid()) {
delete fpsText;
fpsText = new GLTexture(fpsTextImage(fps));
fpsText.reset(new GLTexture(fpsTextImage(fps)));
fpsText->bind();
ShaderBinder binder(ShaderManager::SimpleShader);
if (effects->compositingType() == OpenGL2Compositing) {

@ -93,7 +93,7 @@ private:
int x;
int y;
QRect fps_rect;
GLTexture *fpsText;
QScopedPointer<GLTexture> fpsText;
int textPosition;
QFont textFont;
QColor textColor;

Loading…
Cancel
Save