From d9fa56c179b77edcf527c6d657aa1ea31dbf1f00 Mon Sep 17 00:00:00 2001
From: dmdmdm <dmckellar@gmail.com>
Date: Mon, 27 Jul 2020 10:13:42 -0400
Subject: [PATCH] Share the love: Minor corrections

---
 src/ui/lovedialog.cpp | 9 ++++-----
 src/ui/lovedialog.h   | 1 -
 src/ui/mainwindow.cpp | 7 ++++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/ui/lovedialog.cpp b/src/ui/lovedialog.cpp
index d4e04b128..2c0c965c1 100644
--- a/src/ui/lovedialog.cpp
+++ b/src/ui/lovedialog.cpp
@@ -68,12 +68,11 @@ void LoveDialog::showEvent(QShowEvent* e) {
 
 void LoveDialog::SongRated(float rating) {
   qLog(Debug) << "LoveDialog::SongRated: rating=" << rating;
-  Song* song = &song_;
-  qLog(Debug) << "LoveDialog::SongRated: isValid=" << song->is_valid() << " id=" << song->id();
-  if (!song->is_valid() || song->id() == -1) return;
+  qLog(Debug) << "LoveDialog::SongRated: isValid=" << song_.is_valid() << " id=" << song_.id();
+  if (!song_.is_valid() || song_.id() == -1) return;
 
   qLog(Debug) << "LoveDialog::SongRated: song is valid and id is good";
-  song->set_rating(rating);
-  app_->library_backend()->UpdateSongRatingAsync(song->id(), rating);
+  song_.set_rating(rating);
+  app_->library_backend()->UpdateSongRatingAsync(song_.id(), rating);
   QDialog::accept();
 }
diff --git a/src/ui/lovedialog.h b/src/ui/lovedialog.h
index 0e180f695..e80daee0d 100644
--- a/src/ui/lovedialog.h
+++ b/src/ui/lovedialog.h
@@ -21,7 +21,6 @@
 #include <QDialog>
 
 #include "core/song.h"
-//#include "widgets/lineedit.h"
 
 class Application;
 class Ui_LoveDialog;
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 9e3379774..e679960a5 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -1589,8 +1589,8 @@ void MainWindow::ScrobbledRadioStream() {
 #endif
 
 void MainWindow::Love() {
-  Playlist* activePlaylist = app_->playlist_manager()->active();
-  PlaylistItemPtr item = activePlaylist->current_item();
+  Playlist* active_playlist = app_->playlist_manager()->active();
+  PlaylistItemPtr item = active_playlist->current_item();
   if (!item) {
     // Don't make a big deal about it
     qLog(Warning) << "Love: nothing playing so can't love it";
@@ -1598,7 +1598,8 @@ void MainWindow::Love() {
   }
 
   if (item->IsLocalLibraryItem()) {
-    Song song = item->Metadata();
+    const Song& song = item->Metadata();
+    if (!song.is_valid() || song.id() == -1) return;
     love_dialog_->SetSong(song);
     love_dialog_->show();
   }