From 3c37f74539cf870d563c44b92fc82852b5c46012 Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Thu, 26 Oct 2017 18:45:08 +0000
Subject: fixed memory leaks and other errors

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7649 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/General/converter/converter.cpp      | 2 +-
 src/plugins/General/rgscan/rgscanner.cpp         | 2 +-
 src/plugins/General/scrobbler/scrobblercache.cpp | 4 +++-
 src/plugins/General/statusicon/qmmptrayicon.h    | 1 -
 4 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/plugins/General')

diff --git a/src/plugins/General/converter/converter.cpp b/src/plugins/General/converter/converter.cpp
index 71468ef5c..32a63ec53 100644
--- a/src/plugins/General/converter/converter.cpp
+++ b/src/plugins/General/converter/converter.cpp
@@ -347,7 +347,7 @@ bool Converter::convert(Decoder *decoder, FILE *file, bool use16bit)
                 emit progress(percent);
             }
         }
-        else if (len <= 0)
+        else
         {
             emit progress(100);
             qDebug("Converter: total written: %lld bytes", total);
diff --git a/src/plugins/General/rgscan/rgscanner.cpp b/src/plugins/General/rgscan/rgscanner.cpp
index 65a045d3e..5d7719284 100644
--- a/src/plugins/General/rgscan/rgscanner.cpp
+++ b/src/plugins/General/rgscan/rgscanner.cpp
@@ -180,7 +180,7 @@ void RGScanner::run()
     AudioConverter converter;
     converter.configure(ap.format());
     //buffers
-    double out_left[BUFFER_FRAMES], out_right[BUFFER_FRAMES]; //replay gain buffers
+    double out_left[BUFFER_FRAMES] = {0}, out_right[BUFFER_FRAMES] = {0}; //replay gain buffers
     float float_buf[BUFFER_FRAMES*ap.channels()]; //float buffer
     qint64 buf_size = BUFFER_FRAMES*ap.frameSize();
     unsigned char char_buf[buf_size]; //char buffer
diff --git a/src/plugins/General/scrobbler/scrobblercache.cpp b/src/plugins/General/scrobbler/scrobblercache.cpp
index 5a4475062..b6b1eec78 100644
--- a/src/plugins/General/scrobbler/scrobblercache.cpp
+++ b/src/plugins/General/scrobbler/scrobblercache.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2013-2016 by Ilya Kotov                                 *
+ *   Copyright (C) 2013-2017 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -24,12 +24,14 @@
 SongInfo::SongInfo()
 {
     m_length = 0;
+    m_start_ts = 0;
 }
 
 SongInfo::SongInfo(const QMap <Qmmp::MetaData, QString> metadata, qint64 length)
 {
     m_metadata = metadata;
     m_length = length;
+    m_start_ts = 0;
 }
 
 SongInfo::SongInfo(const SongInfo &other)
diff --git a/src/plugins/General/statusicon/qmmptrayicon.h b/src/plugins/General/statusicon/qmmptrayicon.h
index 2d067d4ed..1aac4736d 100644
--- a/src/plugins/General/statusicon/qmmptrayicon.h
+++ b/src/plugins/General/statusicon/qmmptrayicon.h
@@ -46,7 +46,6 @@ private:
     bool event(QEvent *e);
     void wheelEvent(QWheelEvent *e);
     void showToolTip();
-    bool m_showNiceToolTip;
     QPointer<StatusIconPopupWidget> m_popupWidget;
     QString m_message;
 #endif
-- 
cgit v1.2.3-13-gbd6f