From 2ca38cbe999bdab1ed58a08c14e96171bdd9d97a Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Sat, 5 Mar 2011 13:01:08 +0000
Subject: [PATCH] Don't turn off dynamic mode when adding an empty smart
 playlist.  Fixes issue #1526

---
 src/smartplaylists/generatorinserter.cpp | 8 ++++++--
 src/smartplaylists/generatorinserter.h   | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/smartplaylists/generatorinserter.cpp b/src/smartplaylists/generatorinserter.cpp
index 3ff46a587..4881c4c49 100644
--- a/src/smartplaylists/generatorinserter.cpp
+++ b/src/smartplaylists/generatorinserter.cpp
@@ -33,7 +33,8 @@ GeneratorInserter::GeneratorInserter(
   : QObject(parent),
     task_manager_(task_manager),
     library_(library),
-    task_id_(-1)
+    task_id_(-1),
+    is_dynamic_(false)
 {
 }
 
@@ -54,6 +55,7 @@ void GeneratorInserter::Load(
   row_ = row;
   play_now_ = play_now;
   enqueue_ = enqueue;
+  is_dynamic_ = generator->is_dynamic();
 
   connect(generator.get(), SIGNAL(Error(QString)), SIGNAL(Error(QString)));
 
@@ -71,7 +73,9 @@ void GeneratorInserter::Finished() {
   PlaylistItemList items = watcher->result();
 
   if (items.isEmpty()) {
-    destination_->TurnOffDynamicPlaylist();
+    if (is_dynamic_) {
+      destination_->TurnOffDynamicPlaylist();
+    }
   } else {
     destination_->InsertItems(items, row_, play_now_, enqueue_);
   }
diff --git a/src/smartplaylists/generatorinserter.h b/src/smartplaylists/generatorinserter.h
index ad51be0fc..bbabc9608 100644
--- a/src/smartplaylists/generatorinserter.h
+++ b/src/smartplaylists/generatorinserter.h
@@ -56,6 +56,7 @@ private:
   int row_;
   bool play_now_;
   bool enqueue_;
+  bool is_dynamic_;
 };
 
 } // namespace