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

4 files changed, 8 insertions, 7 deletions

diff --git a/src/plugins/Ui/qsui/listwidgetdrawer.h b/src/plugins/Ui/qsui/listwidgetdrawer.h
index e613d6e24..269640456 100644
--- a/src/plugins/Ui/qsui/listwidgetdrawer.h
+++ b/src/plugins/Ui/qsui/listwidgetdrawer.h
@@ -40,6 +40,7 @@ struct ListWidgetRow
         lengthColumnWidth = 0;
         trackStateColumn = -1;
         autoResize = false;
+        number = 0;
     }
     QStringList titles;
     QList<int> sizes;
diff --git a/src/plugins/Ui/qsui/logo.cpp b/src/plugins/Ui/qsui/logo.cpp
index 548e14fe8..f8fe7cf80 100644
--- a/src/plugins/Ui/qsui/logo.cpp
+++ b/src/plugins/Ui/qsui/logo.cpp
@@ -116,21 +116,21 @@ void Logo::updateLetters()
         m_value = m_elapsed / 100;
         processPreset1();
     }
-    else if (m_elapsed >= 2000 && m_elapsed < 6000)
+    else if (m_elapsed < 6000)
     {
         m_value++;
         processPreset2();
     }
-    else if(m_elapsed >= 6000 && m_elapsed < 9000)
+    else if(m_elapsed < 9000)
     {
         m_value++;
         processPreset3();
     }
-    else if(m_elapsed >= 9000 && m_elapsed < 12000)
+    else if(m_elapsed < 12000)
     {
         processPreset4();
     }
-    else if(m_elapsed >= 12000)
+    else
     {
        m_value = 0;
        m_elapsed = 0;
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index 56f5622ca..bdc7b81c8 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -343,7 +343,7 @@ void MainWindow::updateVolumeIcon()
         iconName = "audio-volume-muted";
     else if(maxVol < 30)
         iconName = "audio-volume-low";
-    else if(maxVol >= 30 && maxVol < 60)
+    else if(maxVol < 60)
         iconName = "audio-volume-medium";
 
     ACTION(ActionManager::VOL_MUTE)->setIcon(QIcon::fromTheme(iconName, QIcon(QString(":/qsui/") + iconName + ".png")));
diff --git a/src/plugins/Ui/qsui/popupwidget.cpp b/src/plugins/Ui/qsui/popupwidget.cpp
index b5a7ef7be..47921a45d 100644
--- a/src/plugins/Ui/qsui/popupwidget.cpp
+++ b/src/plugins/Ui/qsui/popupwidget.cpp
@@ -83,15 +83,15 @@ void PopupWidget::mouseMoveEvent (QMouseEvent *)
 void PopupWidget::prepare(PlayListTrack *track, QPoint pos)
 {
     pos += QPoint(15,10);
-
-    m_url = track->url();
     hide();
     if(!track)
     {
+        m_url.clear();
         m_timer->stop();
         return;
     }
 
+    m_url = track->url();
     m_label1->setText(m_formatter.format(track));
     qApp->processEvents();
     updateGeometry ();