Fixed regression when adding all tracks to play queue
This commit is contained in:
@@ -21,6 +21,8 @@
|
|||||||
#include <Wt/WImage>
|
#include <Wt/WImage>
|
||||||
#include <Wt/WText>
|
#include <Wt/WText>
|
||||||
|
|
||||||
|
#include "utils/Logger.hpp"
|
||||||
|
|
||||||
#include "LmsApplication.hpp"
|
#include "LmsApplication.hpp"
|
||||||
#include "PlaylistView.hpp"
|
#include "PlaylistView.hpp"
|
||||||
|
|
||||||
@@ -65,6 +67,8 @@ Playlist::addTracks(const std::vector<Database::Track::pointer>& tracks)
|
|||||||
// Use a "session" playlist in order to store the current playlist
|
// Use a "session" playlist in order to store the current playlist
|
||||||
// so that the user can disconnect and get its playlist back
|
// so that the user can disconnect and get its playlist back
|
||||||
|
|
||||||
|
LMS_LOG(UI, DEBUG) << "Adding tracks to the current queue";
|
||||||
|
|
||||||
auto playlist = Database::Playlist::get(DboSession(), currentPlaylistName, CurrentUser());
|
auto playlist = Database::Playlist::get(DboSession(), currentPlaylistName, CurrentUser());
|
||||||
if (!playlist)
|
if (!playlist)
|
||||||
{
|
{
|
||||||
@@ -83,6 +87,8 @@ Playlist::addTracks(const std::vector<Database::Track::pointer>& tracks)
|
|||||||
void
|
void
|
||||||
Playlist::playTracks(const std::vector<Database::Track::pointer>& tracks)
|
Playlist::playTracks(const std::vector<Database::Track::pointer>& tracks)
|
||||||
{
|
{
|
||||||
|
LMS_LOG(UI, DEBUG) << "Emptying current queue to play new tracks";
|
||||||
|
|
||||||
Wt::Dbo::Transaction transaction(DboSession());
|
Wt::Dbo::Transaction transaction(DboSession());
|
||||||
|
|
||||||
auto playlist = Database::Playlist::get(DboSession(), currentPlaylistName, CurrentUser());
|
auto playlist = Database::Playlist::get(DboSession(), currentPlaylistName, CurrentUser());
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent)
|
|||||||
container->bindWidget("play-btn", playBtn);
|
container->bindWidget("play-btn", playBtn);
|
||||||
playBtn->clicked().connect(std::bind([=]
|
playBtn->clicked().connect(std::bind([=]
|
||||||
{
|
{
|
||||||
|
Wt::Dbo::Transaction transaction(DboSession());
|
||||||
tracksPlay.emit(getTracks());
|
tracksPlay.emit(getTracks());
|
||||||
}));
|
}));
|
||||||
|
|
||||||
@@ -58,6 +59,7 @@ Tracks::Tracks(Filters* filters, Wt::WContainerWidget* parent)
|
|||||||
container->bindWidget("add-btn", addBtn);
|
container->bindWidget("add-btn", addBtn);
|
||||||
addBtn->clicked().connect(std::bind([=]
|
addBtn->clicked().connect(std::bind([=]
|
||||||
{
|
{
|
||||||
|
Wt::Dbo::Transaction transaction(DboSession());
|
||||||
tracksAdd.emit(getTracks());
|
tracksAdd.emit(getTracks());
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user