Fix sources menu

Author: exeldro

source-tree.cpp

@@ -228,12 +228,17 @@ void SourceTreeItem::Clear()
 	sceneitem = nullptr;
 }
 
+extern std::list<CanvasDock *> canvas_docks;
+
 void SourceTreeItem::removeItem(void *data, calldata_t *cd)
 {
 	SourceTreeItem *this_ = reinterpret_cast<SourceTreeItem *>(data);
 	obs_sceneitem_t *curItem = (obs_sceneitem_t *)calldata_ptr(cd, "item");
 	obs_scene_t *curScene = (obs_scene_t *)calldata_ptr(cd, "scene");
 
+	if (std::find(canvas_docks.begin(), canvas_docks.end(), this_->tree->canvasDock) == canvas_docks.end())
+		return;
+
 	if (curItem == this_->sceneitem) {
 		QMetaObject::invokeMethod(this_->tree, "Remove", Qt::QueuedConnection, Q_ARG(OBSSceneItem, curItem),
 					  Q_ARG(OBSScene, curScene));
@@ -518,8 +523,6 @@ void SourceTreeItem::Renamed(const QString &name)
 	label->setText(name);
 }
 
-extern std::list<CanvasDock *> canvas_docks;
-
 void SourceTreeItem::Update(bool force)
 {
 	if (std::find(canvas_docks.begin(), canvas_docks.end(), tree->canvasDock) == canvas_docks.end())

vertical-canvas.cpp

@@ -4640,10 +4640,10 @@ bool CanvasDock::add_sources_of_type_to_menu(void *param, obs_source_t *source)
 {
 	QMenu *menu = static_cast<QMenu *>(param);
 	auto parent = qobject_cast<QMenu *>(menu->parent());
+	auto a = parent && !parent->menuAction()->data().isNull() ? parent->menuAction() : menu->menuAction();
 	while (parent && qobject_cast<QMenu *>(parent->parent()))
 		parent = qobject_cast<QMenu *>(parent->parent());
 	CanvasDock *cd = static_cast<CanvasDock *>(parent ? parent->parent() : menu->parent());
-	auto a = parent ? parent->menuAction() : menu->menuAction();
 	auto t = a->data().toString();
 	auto idUtf8 = t.toUtf8();
 	const char *id = idUtf8.constData();