Merge branch 'master' into nodeview-redux

app/widget/menu/menushared.h

@@ -52,6 +52,14 @@ public:
 
   static MenuShared* instance();
 
+  QAction* edit_delete_item()
+  {
+    return edit_delete_item_;
+  }
+
+public slots:
+  void DeleteSelectedTriggered();
+
 private:
   // "New" menu shared items
   QAction* new_project_item_;
@@ -97,8 +105,6 @@ private:
 private slots:
   void SplitAtPlayheadTriggered();
 
-  void DeleteSelectedTriggered();
-
   void RippleDeleteTriggered();
 
   void SetInTriggered();

app/widget/projectexplorer/projectexplorer.cpp

@@ -223,6 +223,10 @@ bool ProjectExplorer::DeleteItemsInternal(const QVector<Node*>& selected, bool&
         command->add_child(new CloseSequenceCommand(sequence));
       }
 
+      if (node->folder()) {
+        command->add_child(new Folder::RemoveElementCommand(node->folder(), node));
+      }
+
       command->add_child(new NodeRemoveWithExclusiveDependenciesAndDisconnect(node));
     }
   }