Don't save last playlist if not in saved

kraxarn · Aug 10, 2020 · 3c54448 · 3c54448
1 parent b8cc518
commit 3c54448
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -398,8 +398,11 @@ void MainWindow::saveTracksToCache(const QString &id, const QVector<spt::Track>
 
 bool MainWindow::loadPlaylist(spt::Playlist &playlist)
 {
-	settings.general.lastPlaylist = playlist.id;
-	settings.save();
+	if (!getPlaylistNameFromSaved(playlist.id).isEmpty())
+	{
+		settings.general.lastPlaylist = playlist.id;
+		settings.save();
+	}
 	if (loadPlaylistFromCache(playlist))
 		return true;
 	songs->setEnabled(false);
@@ -624,13 +627,21 @@ void MainWindow::updateContextIcon()
 	contextInfo->setVisible(show);
 }
 
-QString MainWindow::getPlaylistName(const QString &id)
+QString MainWindow::getPlaylistNameFromSaved(const QString &id)
 {
 	for (auto &playlist : sptPlaylists)
 	{
 		if (id.endsWith(playlist.id))
 			return playlist.name;
 	}
+	return QString();
+}
+
+QString MainWindow::getPlaylistName(const QString &id)
+{
+	auto name = getPlaylistNameFromSaved(id);
+	if (!name.isEmpty())
+		return name;
 	return spotify->playlist(id.split(':').last()).name;
 }
 

diff --git a/src/mainwindow.hpp b/src/mainwindow.hpp
@@ -97,6 +97,7 @@ class MainWindow : public QMainWindow
 	bool loadPlaylistFromCache(spt::Playlist &playlist);
 	void updateContextIcon();
 	QString getPlaylistName(const QString &id);
+	QString getPlaylistNameFromSaved(const QString &id);
 	void contextInfoMenu(const QPoint &pos);
 	void contextInfoOpen(bool checked);
 };