Misc. fixes.

6 files changed, 16 insertions, 11 deletions

diff --git a/src/dlgcoverartfullsize.cpp b/src/dlgcoverartfullsize.cpp
index debd0bc480..ac7a7dcf29 100644
--- a/src/dlgcoverartfullsize.cpp
+++ b/src/dlgcoverartfullsize.cpp
@@ -15,7 +15,7 @@ DlgCoverArtFullSize::~DlgCoverArtFullSize() {
 void DlgCoverArtFullSize::init(CoverInfo info) {
     // this cannot be null
     QWidget* activeWindow = QApplication::activeWindow();
-    if (!activeWindow) {
+    if (activeWindow == NULL) {
         return;
     }
 
diff --git a/src/widget/wcoverart.cpp b/src/widget/wcoverart.cpp
index 1adacbff1a..d5290d4829 100644
--- a/src/widget/wcoverart.cpp
+++ b/src/widget/wcoverart.cpp
@@ -5,8 +5,8 @@
 #include <QIcon>
 #include <QPainter>
 
-#include "wcoverart.h"
-#include "wskincolor.h"
+#include "widget/wcoverart.h"
+#include "widget/wskincolor.h"
 #include "library/coverartcache.h"
 
 WCoverArt::WCoverArt(QWidget* parent,
@@ -22,7 +22,7 @@ WCoverArt::WCoverArt(QWidget* parent,
     CoverArtCache* pCache = CoverArtCache::instance();
     if (pCache != NULL) {
         connect(pCache, SIGNAL(pixmapFound(int, QPixmap)),
-                this, SLOT(slotPixmapFound(int, QPixmap)), Qt::DirectConnection);
+                this, SLOT(slotPixmapFound(int, QPixmap)));
         m_loadedCover = pCache->getDefaultCoverArt();
         m_loadedCoverScaled = scaledCoverArt(m_loadedCover);
     }
@@ -116,15 +116,20 @@ void WCoverArt::slotLoadCoverArt(CoverInfo info, bool cachedOnly) {
     }
 }
 
-QPixmap WCoverArt::scaledCoverArt(QPixmap normal) {
+QPixmap WCoverArt::scaledCoverArt(const QPixmap& normal) {
+    if (normal.isNull()) {
+        return QPixmap();
+    }
+
     int height = parentWidget()->height() / 3;
     return normal.scaled(QSize(height - 16, width() - 10),
                          Qt::KeepAspectRatio,
                          Qt::SmoothTransformation);
 }
 
-void WCoverArt::paintEvent(QPaintEvent*) {
+void WCoverArt::paintEvent(QPaintEvent* pEvent) {
     if (!m_bEnable) {
+        QWidget::paintEvent(pEvent);
         return;
     }
 
diff --git a/src/widget/wcoverart.h b/src/widget/wcoverart.h
index be333df7cb..35bc2ed24e 100644
--- a/src/widget/wcoverart.h
+++ b/src/widget/wcoverart.h
@@ -40,7 +40,7 @@ class WCoverArt : public QWidget, public WBaseWidget {
     void leaveEvent(QEvent*);
 
   private:
-    QPixmap scaledCoverArt(QPixmap normal);
+    QPixmap scaledCoverArt(const QPixmap& normal);
 
     bool m_bEnable;
     WCoverArtMenu* m_pMenu;
diff --git a/src/widget/wcoverartlabel.cpp b/src/widget/wcoverartlabel.cpp
index 3aeb7064e5..57f29b82e4 100644
--- a/src/widget/wcoverartlabel.cpp
+++ b/src/widget/wcoverartlabel.cpp
@@ -1,4 +1,4 @@
-#include "wcoverartlabel.h"
+#include "widget/wcoverartlabel.h"
 
 WCoverArtLabel::WCoverArtLabel(QWidget* parent)
         : QLabel(parent),
diff --git a/src/widget/wcoverartlabel.h b/src/widget/wcoverartlabel.h
index 66ca5414b0..190c744837 100644
--- a/src/widget/wcoverartlabel.h
+++ b/src/widget/wcoverartlabel.h
@@ -6,7 +6,7 @@
 #include <QWidget>
 
 #include "dlgcoverartfullsize.h"
-#include "wcoverartmenu.h"
+#include "widget/wcoverartmenu.h"
 
 class WCoverArtLabel : public QLabel {
     Q_OBJECT
diff --git a/src/widget/wcoverartmenu.cpp b/src/widget/wcoverartmenu.cpp
index dc8be5eb94..11541b8525 100644
--- a/src/widget/wcoverartmenu.cpp
+++ b/src/widget/wcoverartmenu.cpp
@@ -47,7 +47,7 @@ void WCoverArtMenu::show(QPoint pos, CoverInfo info, TrackPointer pTrack) {
 }
 
 void WCoverArtMenu::slotChange() {
-    if (m_coverInfo.trackId < 1 || !m_pTrack) {
+    if (m_coverInfo.trackId < 1 || m_pTrack.isNull()) {
         return;
     }
 
@@ -112,7 +112,7 @@ void WCoverArtMenu::slotChange() {
 }
 
 void WCoverArtMenu::slotReload() {
-    if (m_coverInfo.trackId < 1) {
+    if (m_coverInfo.trackId < 1 || m_pTrack.isNull()) {
         return;
     }
     CoverArtCache* pCache = CoverArtCache::instance();