From kde-commits  Fri Jan 21 20:44:18 2011
From: Peter Penz <peter.penz19 () gmail ! com>
Date: Fri, 21 Jan 2011 20:44:18 +0000
To: kde-commits
Subject: KDE/kdelibs/kio/kio
Message-Id: <20110121204418.A93CEAC8B9 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129564270008891

SVN commit 1216195 by ppenz:

When editing the name of file items opening a context-menu for the text-editor may not result in closing the rename-operation. Thanks to Zé for the patch!

CCBUG: 182353


 M  +6 -0      kfileitemdelegate.cpp  


--- trunk/KDE/kdelibs/kio/kio/kfileitemdelegate.cpp #1216194:1216195
@@ -1666,10 +1666,16 @@
 
     case QEvent::FocusOut:
     {
+        const QWidget *w = QApplication::activePopupWidget();
+        if (!w || w->parent() != editor)
+        {
         emit commitData(editor);
         emit closeEditor(editor, NoHint);
         return true;
     }
+        else
+            return false;
+    }
 
     default:
         return false;