When loading URLs via commandline use AppendAndPlay.

Closes #1413
CDrummond · Dec 3, 2018 · 67cbf7b · 67cbf7b
1 parent 6e8faee
commit 67cbf7b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -34,6 +34,7 @@
 24. For MPD>=21, use its albumart protocol to fetch covers.
 25. When copying tracks to a device, only update cache if configured to do so.
 26. Fix MusicBrainz disc ID calculation.
+27. When loading URLs via commandline use AppendAndPlay.
 
 2.3.2
 -----

diff --git a/gui/mainwindow.h b/gui/mainwindow.h
@@ -154,7 +154,7 @@ public Q_SLOTS:
     void mpdConnectionName(const QString &name);
     void hideWindow();
     void restoreWindow();
-    void load(const QStringList &urls) { PlayQueueModel::self()->load(urls); }
+    void load(const QStringList &urls) { PlayQueueModel::self()->load(urls, MPDConnection::AppendAndPlay); }
     void showAboutDialog();
     void mpdConnectionStateChanged(bool connected);
     void playQueueItemsSelected(bool s);

diff --git a/models/playqueuemodel.cpp b/models/playqueuemodel.cpp
@@ -927,7 +927,7 @@ void PlayQueueModel::addFiles(const QStringList &filenames, int row, int action,
     if (MPDConnection::ReplaceAndplay==action) {
         emit filesAdded(filenames, 0, 0, MPDConnection::ReplaceAndplay, priority, decreasePriority);
     } else if (songs.isEmpty()) {
-         emit filesAdded(filenames, 0, 0, MPDConnection::Append, priority, decreasePriority);
+         emit filesAdded(filenames, 0, 0, action, priority, decreasePriority);
     } else if (row < 0) {
         emit filesAdded(filenames, songs.size(), songs.size(), action, priority, decreasePriority);
     } else {