From e553360d24781f40cc10182059130ce71e796a26 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Tue, 19 Jul 2011 19:35:54 -0700 Subject: [PATCH] see #2609 additional checks to make sure we do not allow drag and drop between different instances of the program --- src/libgui/ObjectTreeView.cpp | 3 +++ src/libgui/RuleSetView.cpp | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/libgui/ObjectTreeView.cpp b/src/libgui/ObjectTreeView.cpp index e4c28a434..34c97b663 100644 --- a/src/libgui/ObjectTreeView.cpp +++ b/src/libgui/ObjectTreeView.cpp @@ -535,6 +535,9 @@ void ObjectTreeView::dragMoveEvent(QDragMoveEvent *ev) void ObjectTreeView::dropEvent(QDropEvent *ev) { + // only accept drops from the same instance of fwbuilder + if (ev->source() == NULL) return; + ObjectTreeViewItem *dest = dynamic_cast(itemAt(ev->pos())); if (dest == 0) { diff --git a/src/libgui/RuleSetView.cpp b/src/libgui/RuleSetView.cpp index c74ab0f83..229c9f091 100644 --- a/src/libgui/RuleSetView.cpp +++ b/src/libgui/RuleSetView.cpp @@ -2111,6 +2111,8 @@ void RuleSetView::dragEnterEvent( QDragEnterEvent *ev) void RuleSetView::dropEvent(QDropEvent *ev) { + // only accept drops from the same instance of fwbuilder + if (ev->source() == NULL) return; RuleSetModel* md = ((RuleSetModel*)model()); if (!canChange(md)) return;