Traktor: When removing group in DatabaseView it's children are also r…

…emoved.
apistol78 · Nov 2, 2023 · 90e689b · 90e689b
1 parent 1f8e096
commit 90e689b
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/code/Database/Group.cpp b/code/Database/Group.cpp
@@ -77,6 +77,7 @@ bool Group::remove()
 	if (!m_providerGroup->remove())
 		return false;
 
+	m_parent->internalRemoveGroup(this);
 	internalDestroy();
 	return true;
 }
@@ -322,6 +323,12 @@ bool Group::internalAddExtInstance(const Guid& instanceGuid)
 	return false;
 }
 
+void Group::internalRemoveGroup(Group* childGroup)
+{
+	T_ANONYMOUS_VAR(Acquire< Semaphore >)(m_lock);
+	m_childGroups.remove(childGroup);
+}
+
 void Group::instanceEventCreated(Instance* instance)
 {
 	// Add child instance.

diff --git a/code/Database/Group.h b/code/Database/Group.h
@@ -99,6 +99,8 @@ class T_DLLCLASS Group
 
 	bool internalAddExtInstance(const Guid& instanceGuid);
 
+	void internalRemoveGroup(Group* childGroup);
+
 	// \name IInstanceEventListener
 	// \{
 

diff --git a/code/Editor/App/DatabaseView.cpp b/code/Editor/App/DatabaseView.cpp
@@ -284,6 +284,37 @@ bool replaceIdentifiers(RfmCompound* reflection, const std::list< InstanceClipbo
 	return modified;
 }
 
+bool removeGroup(db::Group* group)
+{
+	// Recurse with child groups first.
+	RefArray< db::Group > childGroups;
+	group->getChildGroups(childGroups);
+	for (auto childGroup : childGroups)
+	{
+		if (!removeGroup(childGroup))
+			return false;
+	}
+
+	// No more child groups; now remove all child instances.
+	RefArray< db::Instance > childInstances;
+	group->getChildInstances(childInstances);
+	for (auto childInstance : childInstances)
+	{
+		if (!childInstance->checkout())
+			return false;
+		if (!childInstance->remove())
+			return false;
+		if (!childInstance->commit())
+			return false;
+	}
+
+	// Finally remove this group since it's now empty.
+	if (!group->remove())
+		return false;
+
+	return true;
+}
+
 	}
 
 DatabaseView::DatabaseView(IEditor* editor)
@@ -665,10 +696,8 @@ bool DatabaseView::handleCommand(const ui::Command& command)
 
 			if (!instance->checkout())
 				return false;
-
 			if (!instance->remove())
 				return false;
-
 			if (!instance->commit())
 				return false;
 
@@ -948,7 +977,7 @@ bool DatabaseView::handleCommand(const ui::Command& command)
 			if (ui::MessageBox::show(this, i18n::Text(L"DATABASE_DELETE_ARE_YOU_SURE"), i18n::Text(L"DATABASE_DELETE_GROUP"), ui::MbYesNo | ui::MbIconQuestion) != ui::DialogResult::Yes)
 				return false;
 
-			if (!group->remove())
+			if (!removeGroup(group))
 				return false;
 
 			updateView();