From c5bfff3db355f949b463a8617cac1a0be794742b Mon Sep 17 00:00:00 2001
From: Robert Knight <robertknight@gmail.com>
Date: Fri, 2 May 2008 00:59:34 +0000
Subject: [PATCH] Fix flicker when dropping a tab onto itself.  Return after
 ignoring the drop event.

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=803111
---
 src/ViewContainer.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/ViewContainer.cpp b/src/ViewContainer.cpp
index d17f62ae2..ed61b3378 100644
--- a/src/ViewContainer.cpp
+++ b/src/ViewContainer.cpp
@@ -561,11 +561,12 @@ void ViewContainerTabBar::dropEvent(QDropEvent* event)
 {
 	setDropIndicator(-1);
 
-	if (!event->mimeData()->hasFormat(ViewProperties::mimeType()))
+	if (    !event->mimeData()->hasFormat(ViewProperties::mimeType())
+        ||  proposedDropIsSameTab(event) )
+    {
 		event->ignore();
-
-	if (proposedDropIsSameTab(event))
-        event->ignore();
+        return;
+    }
 
     int index = dropIndex(event->pos());
     int droppedId = ViewProperties::decodeMimeData(event->mimeData());